Make labels work in asm blocks; allow labels as

parameters.  Rename ValueRefList to ParamList
in AsmParser, since its only use is for parameters.

llvm-svn: 43734

1 files changed, 6 insertions, 3 deletions

diff --git a/llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
index c98c1312fd6..ec84b705bbf 100644
--- a/llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
@@ -803,10 +803,13 @@ void ScheduleDAG::EmitNode(SDNode *Node, unsigned InstanceNo,
             if (ConstantSDNode *CS =
                    dyn_cast<ConstantSDNode>(Node->getOperand(i))) {
               MI->addImmOperand(CS->getValue());
-            } else {
-              GlobalAddressSDNode *GA = 
-                  cast<GlobalAddressSDNode>(Node->getOperand(i));
+            } else if (GlobalAddressSDNode *GA = 
+                  dyn_cast<GlobalAddressSDNode>(Node->getOperand(i))) {
               MI->addGlobalAddressOperand(GA->getGlobal(), GA->getOffset());
+            } else {
+              BasicBlockSDNode *BB =
+                  cast<BasicBlockSDNode>(Node->getOperand(i));
+              MI->addMachineBasicBlockOperand(BB->getBasicBlock());
             }
           }
           break;