r312573 - Commit changes missing from r312572

[Reid Kleckner via cfe-commits]

Author: rnk
Date: Tue Sep  5 13:38:29 2017
New Revision: 312573

URL: http://llvm.org/viewvc/llvm-project?rev=312573&view=rev
Log:
Commit changes missing from r312572

Modified:
    cfe/trunk/lib/CodeGen/CGBuiltin.cpp
    cfe/trunk/test/CodeGen/ms-annotation.c

Modified: cfe/trunk/lib/CodeGen/CGBuiltin.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGBuiltin.cpp?rev=312573&r1=312572&r2=312573&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGBuiltin.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGBuiltin.cpp Tue Sep  5 13:38:29 2017
@@ -1971,7 +1971,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(
     }
 
     // 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();

Modified: cfe/trunk/test/CodeGen/ms-annotation.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/ms-annotation.c?rev=312573&r1=312572&r2=312573&view=diff
==============================================================================
--- cfe/trunk/test/CodeGen/ms-annotation.c (original)
+++ cfe/trunk/test/CodeGen/ms-annotation.c Tue Sep  5 13:38:29 2017
@@ -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"}