diff --git a/lib/CodeGen/RegAllocFast.cpp b/lib/CodeGen/RegAllocFast.cpp
index fc150d5..8301402 100644
--- a/lib/CodeGen/RegAllocFast.cpp
+++ b/lib/CodeGen/RegAllocFast.cpp
@@ -798,9 +798,11 @@
             setPhysReg(MI, i, LRI->second.PhysReg);
           else {
             int SS = StackSlotForVirtReg[Reg];
-            if (SS == -1)
+            if (SS == -1) {
               // We can't allocate a physreg for a DebugValue, sorry!
+              DEBUG(dbgs() << "Unable to allocate vreg used by DBG_VALUE");
               MO.setReg(0);
+            }
             else {
               // Modify DBG_VALUE now that the value is in a spill slot.
               int64_t Offset = MI->getOperand(1).getImm();
@@ -817,9 +819,11 @@
                 MI = NewDV;
                 ScanDbgValue = true;
                 break;
-              } else
+              } else {
                 // We can't allocate a physreg for a DebugValue; sorry!
+                DEBUG(dbgs() << "Unable to allocate vreg used by DBG_VALUE");
                 MO.setReg(0);
+              }
             }
           }
         }
diff --git a/lib/CodeGen/SelectionDAG/FastISel.cpp b/lib/CodeGen/SelectionDAG/FastISel.cpp
index a4eed71..db58e23 100644
--- a/lib/CodeGen/SelectionDAG/FastISel.cpp
+++ b/lib/CodeGen/SelectionDAG/FastISel.cpp
@@ -473,10 +473,18 @@
       return true;
     const AllocaInst *AI = dyn_cast<AllocaInst>(Address);
     // Don't handle byval struct arguments or VLAs, for example.
-    if (!AI)
+    if (!AI) {
       // Building the map above is target independent.  Generating DBG_VALUE
       // inline is target dependent; do this now.
-      (void)TargetSelectInstruction(cast<Instruction>(I));
+      DenseMap<const Value *, unsigned>::iterator It =
+        FuncInfo.ValueMap.find(Address);
+      if (0 && It != FuncInfo.ValueMap.end()) {
+        BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, 
+                TII.get(TargetOpcode::DBG_VALUE))
+               .addReg(It->second, RegState::Debug).addImm(0).addMetadata(DI->getVariable());
+      } else
+        (void)TargetSelectInstruction(cast<Instruction>(I));
+    }
     return true;
   }
   case Intrinsic::dbg_value: {