summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReid Kleckner <rnk@google.com>2017-09-05 20:38:29 +0000
committerReid Kleckner <rnk@google.com>2017-09-05 20:38:29 +0000
commitd53c39ba46ef103b2c6aa8f2ec516491bdb6acfb (patch)
treecaed2612b9a7467749cda7d14052607b70835a15
parent30701edf761cd55cab6a8d3f756275fb156d0bba (diff)
downloadbcm5719-llvm-d53c39ba46ef103b2c6aa8f2ec516491bdb6acfb.tar.gz
bcm5719-llvm-d53c39ba46ef103b2c6aa8f2ec516491bdb6acfb.zip
Commit changes missing from r312572
llvm-svn: 312573
-rw-r--r--clang/lib/CodeGen/CGBuiltin.cpp2
-rw-r--r--clang/test/CodeGen/ms-annotation.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp
index 71705146a17..a4a06193146 100644
--- a/clang/lib/CodeGen/CGBuiltin.cpp
+++ b/clang/lib/CodeGen/CGBuiltin.cpp
@@ -1971,7 +1971,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD,
}
// Build and MDTuple of MDStrings and emit the intrinsic call.
- llvm::Value *F = CGM.getIntrinsic(llvm::Intrinsic::label_annotation, {});
+ llvm::Value *F = CGM.getIntrinsic(llvm::Intrinsic::codeview_annotation, {});
MDTuple *StrTuple = MDTuple::get(getLLVMContext(), Strings);
Builder.CreateCall(F, MetadataAsValue::get(getLLVMContext(), StrTuple));
return RValue::getIgnored();
diff --git a/clang/test/CodeGen/ms-annotation.c b/clang/test/CodeGen/ms-annotation.c
index 4459fc032a0..6f4a20c7b15 100644
--- a/clang/test/CodeGen/ms-annotation.c
+++ b/clang/test/CodeGen/ms-annotation.c
@@ -12,11 +12,11 @@ void test1(void) {
}
// CHECK-LABEL: define void @test1()
-// CHECK: call void @llvm.label.annotation(metadata ![[A1:[0-9]+]])
-// CHECK: call void @llvm.label.annotation(metadata ![[A2:[0-9]+]])
-// CHECK: call void @llvm.label.annotation(metadata ![[A3:[0-9]+]])
-// CHECK: call void @llvm.label.annotation(metadata ![[A4:[0-9]+]])
-// CHECK: call void @llvm.label.annotation(metadata ![[A5:[0-9]+]])
+// CHECK: call void @llvm.codeview.annotation(metadata ![[A1:[0-9]+]])
+// CHECK: call void @llvm.codeview.annotation(metadata ![[A2:[0-9]+]])
+// CHECK: call void @llvm.codeview.annotation(metadata ![[A3:[0-9]+]])
+// CHECK: call void @llvm.codeview.annotation(metadata ![[A4:[0-9]+]])
+// CHECK: call void @llvm.codeview.annotation(metadata ![[A5:[0-9]+]])
// CHECK: ret void
// CHECK: ![[A1]] = !{!"a1"}
OpenPOWER on IntegriCloud