Schedule discriminators pass.

[dnovillo]

Summary

This patch schedules the pass to add discriminators.
It depends on http://llvm-reviews.chandlerc.com/D2691.

[dnovillo]

Update call to DIBuilder::createLexicalBlock.

There is a new argument for discriminators.

[echristo]

lib/CodeGen/CGDebugInfo.cpp

2581 ↗

(On Diff #6994)

This change doesn't seem relevant to this patch?

[dnovillo]

This adds two additional changes required by the discriminator
pass:

1- Add discriminator argument when calling DIBuilder::createLexicalBlock.

2- Modify line table test to account for new lexical block created to

support the new discriminator value.

[echristo]

Last change doesn't seem to be required to schedule the pass.

[echristo]

Comments inline.

lib/CodeGen/CGDebugInfo.cpp

2581 ↗

(On Diff #7183)

This can go in before, it just means that nothing will deal with it yes? In addition, it would be good to test that nothing changes if you pass 0 here and don't actually run the pass.

test/CodeGenCXX/linetable-eh.cpp

9

This is with the pass running?

[dnovillo]

Factored some bits from this patch into http://llvm-reviews.chandlerc.com/D2891.

lib/CodeGen/BackendUtil.cpp

 static void addSampleProfileLoaderPass(const PassManagerBuilder &Builder,
                                        PassManagerBase &PM) {
   const PassManagerBuilderWrapper &BuilderWrapper =
       static_cast<const PassManagerBuilderWrapper &>(Builder);
   const CodeGenOptions &CGOpts = BuilderWrapper.getCGOpts();
   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());
 }
 
 static void addAddressSanitizerPasses(const PassManagerBuilder &Builder,
                                       PassManagerBase &PM) {
   const PassManagerBuilderWrapper &BuilderWrapper =
void EmitAssemblyHelper::CreatePasses() {
   PMBuilder.BBVectorize = CodeGenOpts.VectorizeBB;
   PMBuilder.SLPVectorize = CodeGenOpts.VectorizeSLP;
   PMBuilder.LoopVectorize = CodeGenOpts.VectorizeLoop;
 
   PMBuilder.DisableUnitAtATime = !CodeGenOpts.UnitAtATime;
   PMBuilder.DisableUnrollLoops = !CodeGenOpts.UnrollLoops;
   PMBuilder.RerollLoops = CodeGenOpts.RerollLoops;
 
+  PMBuilder.addExtension(PassManagerBuilder::EP_EarlyAsPossible,
+                         addAddDiscriminatorsPass);
+
   if (!CodeGenOpts.SampleProfileFile.empty())
     PMBuilder.addExtension(PassManagerBuilder::EP_EarlyAsPossible,
                            addSampleProfileLoaderPass);
 
   // In ObjC ARC mode, add the main ARC optimization passes.
   if (LangOpts.ObjCAutoRefCount) {
     PMBuilder.addExtension(PassManagerBuilder::EP_EarlyAsPossible,
                            addObjCARCExpandPass);

test/CodeGenCXX/linetable-eh.cpp

 // RUN: %clang_cc1 -emit-llvm -g -triple x86_64-apple-macosx10.9.0 -munwind-tables -std=c++11 -fcxx-exceptions -fexceptions %s -o - | FileCheck %s
 
 // Test that emitting a landing pad does not affect the line table
 // entries for the code that triggered it.
 
 // 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:.*]]
 // CHECK-DAG: ![[CURRENT_ADDR]] = {{.*}} [current_address]
 // CHECK-DAG: ![[FOUND_IT]] = {{.*}} [found_it]
 // 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:
   typedef _Tp element_type;
   element_type* __ptr_;
   ~shared_ptr();
   element_type* operator->() const noexcept {return __ptr_;}
 };