Disable generation of basic block names in NDEBUG mode.

Revert to enabling generation of instruction names when not in NDEBUG
mode.

llvm-svn: 59094

2 files changed, 9 insertions, 1 deletions

diff --git a/clang/lib/CodeGen/CGBuilder.h b/clang/lib/CodeGen/CGBuilder.h
index 3f592954875..ed56bd91377 100644
--- a/clang/lib/CodeGen/CGBuilder.h
+++ b/clang/lib/CodeGen/CGBuilder.h
@@ -14,8 +14,12 @@
 
 namespace clang {
 namespace CodeGen {
-  // Don't preserve names on values by default.
+  // Don't preserve names on values in an optimized build.
+#ifdef NDEBUG
   typedef llvm::IRBuilder<false> CGBuilderTy;
+#else
+  typedef llvm::IRBuilder<> CGBuilderTy;
+#endif
 }  // end namespace CodeGen
 }  // end namespace clang
 
diff --git a/clang/lib/CodeGen/CodeGenFunction.h b/clang/lib/CodeGen/CodeGenFunction.h
index 1b573700da1..38d9cf31d0e 100644
--- a/clang/lib/CodeGen/CodeGenFunction.h
+++ b/clang/lib/CodeGen/CodeGenFunction.h
@@ -222,7 +222,11 @@ public:
   llvm::BasicBlock *createBasicBlock(const char *Name="", 
                                      llvm::Function *Parent=0,
                                      llvm::BasicBlock *InsertBefore=0) {
+#ifdef NDEBUG
+    return llvm::BasicBlock::Create("", Parent, InsertBefore);
+#else
     return llvm::BasicBlock::Create(Name, Parent, InsertBefore);
+#endif
   }
                                     
   /// getBasicBlockForLabel - Return the LLVM basicblock that the specified