replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix check strings in test case and use llvm::to_string instead of 

std::to_string.

These changes were needed to fix bots that started failing after
r315045.

llvm-svn: 315046
This commit is contained in:
Akira Hatanaka 2017-10-06 07:47:47 +00:00
parent 6b103bc18c
commit a46381286f
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/CodeGen/CGBuiltin.cpp
View File

@ -30,6 +30,7 @@
#include "llvm/IR/InlineAsm.h"
#include "llvm/IR/Intrinsics.h"
#include "llvm/IR/MDBuilder.h"
#include "llvm/Support/ScopedPrinter.h"
#include "llvm/Support/ConvertUTF.h"
#include <sstream>
@ -698,9 +699,10 @@ llvm::Function *CodeGenFunction::generateBuiltinOSLogHelperFunction(
if (!Size)
continue;
Params.emplace_back(Ctx, nullptr, SourceLocation(),
&Ctx.Idents.get(std::string("arg") + std::to_string(I)),
getOSLogArgType(Ctx, Size), ImplicitParamDecl::Other);
Params.emplace_back(
Ctx, nullptr, SourceLocation(),
&Ctx.Idents.get(std::string("arg") + llvm::to_string(I)),
getOSLogArgType(Ctx, Size), ImplicitParamDecl::Other);
}
FunctionArgList Args;

14
clang/test/CodeGenObjC/os_log.m
View File

@ -19,10 +19,10 @@ extern __attribute__((visibility("default"))) NSString *GenString();
void *test_builtin_os_log(void *buf) {
return __builtin_os_log_format(buf, "capabilities: %@", GenString());
// CHECK: %[[CALL:.*]] = tail call %[[V0:.*]]* (...) @GenString()
// CHECK: %[[V0]] = bitcast %[[V0]]* %[[CALL]] to i8*
// CHECK: %[[CALL:.*]] = tail call %[[TY0:.*]]* (...) @GenString()
// CHECK: %[[V0:.*]] = bitcast %[[TY0]]* %[[CALL]] to i8*
// CHECK: %[[V1:.*]] = tail call i8* @objc_retainAutoreleasedReturnValue(i8* %[[V0]])
// CHECK: %[[V2:.*]] = ptrtoint %[[V0]]* %[[CALL]] to i64
// CHECK: %[[V2:.*]] = ptrtoint %[[TY0]]* %[[CALL]] to i64
// CHECK: store i8 2, i8* %[[BUF]], align 1
// CHECK: %[[NUMARGS_I:.*]] = getelementptr i8, i8* %[[BUF]], i64 1
// CHECK: store i8 1, i8* %[[NUMARGS_I]], align 1
@ -43,13 +43,13 @@ void *test_builtin_os_log(void *buf) {
// CHECK-O0: %[[BUF_ADDR:.*]] = alloca i8*, align 8
// CHECK-O0: store i8* %[[BUF]], i8** %[[BUF_ADDR]], align 8
// CHECK-O0: %[[V0:.*]] = load i8*, i8** %[[BUF_ADDR]], align 8
// CHECK-O0: %[[CALL:.*]] = call %[[V0]]* (...) @GenString()
// CHECK-O0: %[[V1:.*]] = bitcast %[[V0]]* %[[CALL]] to i8*
// CHECK-O0: %[[CALL:.*]] = call %[[TY0:.*]]* (...) @GenString()
// CHECK-O0: %[[V1:.*]] = bitcast %[[TY0]]* %[[CALL]] to i8*
// CHECK-O0: %[[V2:.*]] = call i8* @objc_retainAutoreleasedReturnValue(i8* %[[V1]])
// CHECK-O0: %[[V3:.*]] = bitcast i8* %[[V2]] to %[[V0]]*
// CHECK-O0: %[[V4:.*]] = ptrtoint %[[V0]]* %[[V3]] to i64
// CHECK-O0: %[[V4:.*]] = ptrtoint %[[TY0]]* %[[V3]] to i64
// CHECK-O0: call void @__os_log_helper_1_2_1_8_64(i8* %[[V0]], i64 %[[V4]])
// CHECK-O0: %[[V5:.*]] = bitcast %[[V0]]* %[[V3]] to i8*
// CHECK-O0: %[[V5:.*]] = bitcast %[[TY0]]* %[[V3]] to i8*
// CHECK-O0-NOT call void (...) @clang.arc.use({{.*}}
// CHECK-O0: call void @objc_release(i8* %[[V5]])
// CHECK-O0: ret i8* %[[V0]]