Index: llvm/trunk/include/llvm/DebugInfo/PDB/DIA/DIASupport.h
===================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/DIA/DIASupport.h
+++ llvm/trunk/include/llvm/DebugInfo/PDB/DIA/DIASupport.h
@@ -22,14 +22,6 @@
 #define NOMINMAX
 #endif
 
-// llvm/Support/Debug.h unconditionally #defines DEBUG as a macro.
-// DIA headers #define it if it is not already defined, so we have
-// an order of includes problem.  The real fix is to make LLVM use
-// something less generic than DEBUG, such as LLVM_DEBUG(), but it's
-// fairly prevalent.  So for now, we save the definition state and
-// restore it.
-#pragma push_macro("DEBUG")
-
 // atlbase.h has to come before windows.h
 #include <atlbase.h>
 #include <windows.h>
@@ -39,6 +31,4 @@
 #include <dia2.h>
 #include <diacreate.h>
 
-#pragma pop_macro("DEBUG")
-
 #endif // LLVM_DEBUGINFO_PDB_DIA_DIASUPPORT_H
Index: llvm/trunk/include/llvm/Support/Debug.h
===================================================================
--- llvm/trunk/include/llvm/Support/Debug.h
+++ llvm/trunk/include/llvm/Support/Debug.h
@@ -118,8 +118,6 @@
 //
 #define LLVM_DEBUG(X) DEBUG_WITH_TYPE(DEBUG_TYPE, X)
 
-#define DEBUG(X) LLVM_DEBUG(X)
-
 } // end namespace llvm
 
 #endif // LLVM_SUPPORT_DEBUG_H
Index: llvm/trunk/lib/Target/X86/X86DomainReassignment.cpp
===================================================================
--- llvm/trunk/lib/Target/X86/X86DomainReassignment.cpp
+++ llvm/trunk/lib/Target/X86/X86DomainReassignment.cpp
@@ -753,7 +753,7 @@
   }
 
   for (Closure &C : Closures) {
-    DEBUG(C.dump(MRI));
+    LLVM_DEBUG(C.dump(MRI));
     if (isReassignmentProfitable(C, MaskDomain)) {
       reassign(C, MaskDomain);
       ++NumClosuresConverted;
Index: llvm/trunk/lib/Transforms/IPO/MergeFunctions.cpp
===================================================================
--- llvm/trunk/lib/Transforms/IPO/MergeFunctions.cpp
+++ llvm/trunk/lib/Transforms/IPO/MergeFunctions.cpp
@@ -645,8 +645,8 @@
 static bool isThunkProfitable(Function * F) {
   if (F->size() == 1) {
     if (F->front().size() <= 2) {
-      DEBUG(dbgs() << "isThunkProfitable: " << F->getName()
-                    << " is too small to bother creating a thunk for\n");
+      LLVM_DEBUG(dbgs() << "isThunkProfitable: " << F->getName()
+                        << " is too small to bother creating a thunk for\n");
       return false;
     }
   }
Index: llvm/trunk/lib/Transforms/Vectorize/VPlanHCFGBuilder.cpp
===================================================================
--- llvm/trunk/lib/Transforms/Vectorize/VPlanHCFGBuilder.cpp
+++ llvm/trunk/lib/Transforms/Vectorize/VPlanHCFGBuilder.cpp
@@ -116,7 +116,7 @@
     return BlockIt->second;
 
   // Create new VPBB.
-  DEBUG(dbgs() << "Creating VPBasicBlock for " << BB->getName() << "\n");
+  LLVM_DEBUG(dbgs() << "Creating VPBasicBlock for " << BB->getName() << "\n");
   VPBasicBlock *VPBB = new VPBasicBlock(BB->getName());
   BB2VPBB[BB] = VPBB;
   VPBB->setParent(TopRegion);
@@ -314,7 +314,7 @@
   PlainCFGBuilder PCFGBuilder(TheLoop, LI, Plan);
   VPRegionBlock *TopRegion = PCFGBuilder.buildPlainCFG();
   Plan.setEntry(TopRegion);
-  DEBUG(Plan.setName("HCFGBuilder: Plain CFG\n"); dbgs() << Plan);
+  LLVM_DEBUG(Plan.setName("HCFGBuilder: Plain CFG\n"); dbgs() << Plan);
 
   Verifier.verifyHierarchicalCFG(TopRegion);
 }
Index: llvm/trunk/lib/Transforms/Vectorize/VPlanVerifier.cpp
===================================================================
--- llvm/trunk/lib/Transforms/Vectorize/VPlanVerifier.cpp
+++ llvm/trunk/lib/Transforms/Vectorize/VPlanVerifier.cpp
@@ -120,7 +120,7 @@
   if (!EnableHCFGVerifier)
     return;
 
-  DEBUG(dbgs() << "Verifying VPlan H-CFG.\n");
+  LLVM_DEBUG(dbgs() << "Verifying VPlan H-CFG.\n");
   assert(!TopRegion->getParent() && "VPlan Top Region should have no parent.");
   verifyRegionRec(TopRegion);
 }
Index: llvm/trunk/utils/TableGen/GlobalISelEmitter.cpp
===================================================================
--- llvm/trunk/utils/TableGen/GlobalISelEmitter.cpp
+++ llvm/trunk/utils/TableGen/GlobalISelEmitter.cpp
@@ -4063,7 +4063,7 @@
   }
   ProcessCurrentGroup();
 
-  DEBUG(dbgs() << "NumGroups: " << NumGroups << "\n");
+  LLVM_DEBUG(dbgs() << "NumGroups: " << NumGroups << "\n");
   assert(CurrentGroup->empty() && "The last group wasn't properly processed");
   return OptRules;
 }