diff options
| -rw-r--r-- | clang/lib/CodeGen/BackendUtil.cpp | 8 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/linetable-eh.cpp | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index 809333aaa15..478993a9f0f 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/lib/CodeGen/BackendUtil.cpp @@ -166,6 +166,11 @@ static void addSampleProfileLoaderPass(const PassManagerBuilder &Builder, PM.add(createSampleProfileLoaderPass(CGOpts.SampleProfileFile)); } +static void addAddDiscriminatorsPass(const PassManagerBuilder &Builder, + PassManagerBase &PM) { + PM.add(createAddDiscriminatorsPass()); +} + static void addBoundsCheckingPass(const PassManagerBuilder &Builder, PassManagerBase &PM) { PM.add(createBoundsCheckingPass()); @@ -246,6 +251,9 @@ void EmitAssemblyHelper::CreatePasses() { PMBuilder.DisableUnrollLoops = !CodeGenOpts.UnrollLoops; PMBuilder.RerollLoops = CodeGenOpts.RerollLoops; + PMBuilder.addExtension(PassManagerBuilder::EP_EarlyAsPossible, + addAddDiscriminatorsPass); + if (!CodeGenOpts.SampleProfileFile.empty()) PMBuilder.addExtension(PassManagerBuilder::EP_EarlyAsPossible, addSampleProfileLoaderPass); diff --git a/clang/test/CodeGenCXX/linetable-eh.cpp b/clang/test/CodeGenCXX/linetable-eh.cpp index d190c64c01d..14a5067cf3e 100644 --- a/clang/test/CodeGenCXX/linetable-eh.cpp +++ b/clang/test/CodeGenCXX/linetable-eh.cpp @@ -6,7 +6,7 @@ // CHECK: call void @llvm.dbg.declare // CHECK: call void @llvm.dbg.declare(metadata !{{{.*}}}, metadata ![[CURRENT_ADDR:.*]]), !dbg ![[DBG1:.*]] // CHECK: unwind label %{{.*}}, !dbg ![[DBG1]] -// CHECK: store i64 %{{.*}}, i64* %current_address, align 8, !dbg ![[DBG1]] +// CHECK: store i64 %{{.*}}, i64* %current_address, align 8, !dbg ![[DBG4:.*]] // CHECK-NEXT: call void @llvm.dbg.declare(metadata !{{{.*}}}, metadata ![[FOUND_IT:.*]]), !dbg ![[DBG2:.*]] // CHECK: = landingpad // CHECK-NEXT: cleanup, !dbg ![[DBG3:.*]] @@ -15,6 +15,7 @@ // CHECK-DAG: ![[DBG1]] = metadata !{i32 256, // CHECK-DAG: ![[DBG2]] = metadata !{i32 257, // CHECK-DAG: ![[DBG3]] = metadata !{i32 268, +// CHECK-DAG: ![[DBG4]] = metadata !{i32 256, typedef unsigned long long uint64_t; template<class _Tp> class shared_ptr { public: |
