diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index be742d9b8067..de9390eb9f41 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -879,7 +879,7 @@ void CGDebugInfo::EmitFunctionStart(const char *Name, QualType ReturnType,
                                   getOrCreateType(ReturnType, Unit),
                                   Fn->hasInternalLinkage(), true/*definition*/);
 
-  DebugFactory.InsertSubprogramStart(SP, Builder.GetInsertBlock());
+//  DebugFactory.InsertSubprogramStart(SP, Builder.GetInsertBlock());
 
   // Push function on region stack.
   RegionStack.push_back(SP);
@@ -903,8 +903,19 @@ void CGDebugInfo::EmitStopPoint(llvm::Function *Fn, CGBuilderTy &Builder) {
   // Get the appropriate compile unit.
   llvm::DICompileUnit Unit = getOrCreateCompileUnit(CurLoc);
   PresumedLoc PLoc = SM.getPresumedLoc(CurLoc);
+
+#ifdef ATTACH_DEBUG_INFO_TO_AN_INSN
+  llvm::DIDescriptor DR = RegionStack.back();
+  llvm::DIScope DS = llvm::DIScope(DR.getNode());
+  llvm::DILocation DO(NULL);
+  llvm::DILocation DL = 
+    DebugFactory.CreateLocation(PLoc.getLine(), PLoc.getColumn(),
+                                DS, DO);
+  Builder.SetCurrentDebugLocation(DL.getNode());
+#else
   DebugFactory.InsertStopPoint(Unit, PLoc.getLine(), PLoc.getColumn(),
                                Builder.GetInsertBlock());
+#endif
 }
 
 /// EmitRegionStart- Constructs the debug code for entering a declarative
@@ -915,7 +926,9 @@ void CGDebugInfo::EmitRegionStart(llvm::Function *Fn, CGBuilderTy &Builder) {
     D = RegionStack.back();
   D = DebugFactory.CreateLexicalBlock(D);
   RegionStack.push_back(D);
+#ifndef ATTACH_DEBUG_INFO_TO_AN_INSN
   DebugFactory.InsertRegionStart(D, Builder.GetInsertBlock());
+#endif
 }
 
 /// EmitRegionEnd - Constructs the debug code for exiting a declarative
@@ -926,7 +939,9 @@ void CGDebugInfo::EmitRegionEnd(llvm::Function *Fn, CGBuilderTy &Builder) {
   // Provide an region stop point.
   EmitStopPoint(Fn, Builder);
 
+#ifndef ATTACH_DEBUG_INFO_TO_AN_INSN
   DebugFactory.InsertRegionEnd(RegionStack.back(), Builder.GetInsertBlock());
+#endif
   RegionStack.pop_back();
 }
 
diff --git a/clang/lib/CodeGen/CGDebugInfo.h b/clang/lib/CodeGen/CGDebugInfo.h
index ff8ec0574c27..0a617b999240 100644
--- a/clang/lib/CodeGen/CGDebugInfo.h
+++ b/clang/lib/CodeGen/CGDebugInfo.h
@@ -148,4 +148,5 @@ private:
 } // namespace CodeGen
 } // namespace clang
 
+
 #endif
diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index d89da3224fc0..7a124b6d130e 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -31,7 +31,11 @@ llvm::AllocaInst *CodeGenFunction::CreateTempAlloca(const llvm::Type *Ty,
                                                     const char *Name) {
   if (!Builder.isNamePreserving())
     Name = "";
-  return new llvm::AllocaInst(Ty, 0, Name, AllocaInsertPt);
+  llvm::AllocaInst *AI = new llvm::AllocaInst(Ty, 0, Name, AllocaInsertPt);
+#ifdef ATTACH_DEBUG_INFO_TO_AN_INSN
+  Builder.SetDebugLocation(AI);
+#endif
+  return AI;
 }
 
 /// EvaluateExprAsBool - Perform the usual unary conversions on the specified
diff --git a/clang/lib/CodeGen/CGStmt.cpp b/clang/lib/CodeGen/CGStmt.cpp
index 2a5d5edd25eb..62e465d7028f 100644
--- a/clang/lib/CodeGen/CGStmt.cpp
+++ b/clang/lib/CodeGen/CGStmt.cpp
@@ -148,12 +148,13 @@ RValue CodeGenFunction::EmitCompoundStmt(const CompoundStmt &S, bool GetLast,
 
   CGDebugInfo *DI = getDebugInfo();
   if (DI) {
+#ifdef ATTACH_DEBUG_INFO_TO_AN_INSN
+    DI->setLocation(S.getLBracLoc());
+    DI->EmitRegionStart(CurFn, Builder);
+#else
     EnsureInsertPoint();
     DI->setLocation(S.getLBracLoc());
-    // FIXME: The llvm backend is currently not ready to deal with region_end
-    // for block scoping.  In the presence of always_inline functions it gets so
-    // confused that it doesn't emit any debug info.  Just disable this for now.
-    //DI->EmitRegionStart(CurFn, Builder);
+#endif    
   }
 
   // Keep track of the current cleanup stack depth.
@@ -166,13 +167,13 @@ RValue CodeGenFunction::EmitCompoundStmt(const CompoundStmt &S, bool GetLast,
     EmitStmt(*I);
 
   if (DI) {
+#ifdef ATTACH_DEBUG_INFO_TO_AN_INSN
+    DI->setLocation(S.getLBracLoc());
+    DI->EmitRegionEnd(CurFn, Builder);
+#else
     EnsureInsertPoint();
-    DI->setLocation(S.getRBracLoc());
-
-    // FIXME: The llvm backend is currently not ready to deal with region_end
-    // for block scoping.  In the presence of always_inline functions it gets so
-    // confused that it doesn't emit any debug info.  Just disable this for now.
-    //DI->EmitRegionEnd(CurFn, Builder);
+    DI->setLocation(S.getLBracLoc());
+#endif    
   }
 
   RValue RV;
@@ -478,6 +479,13 @@ void CodeGenFunction::EmitForStmt(const ForStmt &S) {
   BreakContinueStack.push_back(BreakContinue(AfterFor, ContinueBlock));
 
   // If the condition is true, execute the body of the for stmt.
+#ifdef ATTACH_DEBUG_INFO_TO_AN_INSN
+  CGDebugInfo *DI = getDebugInfo();
+  if (DI) {
+    DI->setLocation(S.getSourceRange().getBegin());
+    DI->EmitRegionStart(CurFn, Builder);
+  }
+#endif
   EmitStmt(S.getBody());
 
   BreakContinueStack.pop_back();
@@ -490,6 +498,12 @@ void CodeGenFunction::EmitForStmt(const ForStmt &S) {
 
   // Finally, branch back up to the condition for the next iteration.
   EmitBranch(CondBlock);
+#ifdef ATTACH_DEBUG_INFO_TO_AN_INSN
+  if (DI) {
+    DI->setLocation(S.getSourceRange().getEnd());
+    DI->EmitRegionEnd(CurFn, Builder);
+  }
+#endif
 
   // Emit the fall-through block.
   EmitBlock(AfterFor, true);