diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-04-07 23:50:38 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-04-07 23:50:38 +0000 |
| commit | c09d2cffe8a20019079c372ad39ea9987b25f4da (patch) | |
| tree | 9042b4fdff1c3acf39fe6d59e64e85eb87208e3b | |
| parent | f089358a6614476111863ca914f7f07a1a8c69b2 (diff) | |
| download | external_llvm-c09d2cffe8a20019079c372ad39ea9987b25f4da.zip external_llvm-c09d2cffe8a20019079c372ad39ea9987b25f4da.tar.gz external_llvm-c09d2cffe8a20019079c372ad39ea9987b25f4da.tar.bz2 | |
minor tidying.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@100725 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 7 | ||||
| -rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index 583161f..d783dd0 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -5326,6 +5326,7 @@ void SelectionDAGBuilder::visitInlineAsm(CallSite CS) { // error. if (OpInfo.hasMatchingInput()) { SDISelAsmOperandInfo &Input = ConstraintOperands[OpInfo.MatchingInput]; + if (OpInfo.ConstraintVT != Input.ConstraintVT) { if ((OpInfo.ConstraintVT.isInteger() != Input.ConstraintVT.isInteger()) || @@ -5539,10 +5540,9 @@ void SelectionDAGBuilder::visitInlineAsm(CallSite CS) { std::vector<SDValue> Ops; TLI.LowerAsmOperandForConstraint(InOperandVal, OpInfo.ConstraintCode[0], hasMemory, Ops, DAG); - if (Ops.empty()) { + if (Ops.empty()) report_fatal_error("Invalid operand for inline asm" " constraint '" + OpInfo.ConstraintCode + "'!"); - } // Add information to the INLINEASM node to know about this input. unsigned ResOpType = @@ -5574,10 +5574,9 @@ void SelectionDAGBuilder::visitInlineAsm(CallSite CS) { // Copy the input into the appropriate registers. if (OpInfo.AssignedRegs.Regs.empty() || - !OpInfo.AssignedRegs.areValueTypesLegal()) { + !OpInfo.AssignedRegs.areValueTypesLegal()) report_fatal_error("Couldn't allocate input reg for" " constraint '"+ OpInfo.ConstraintCode +"'!"); - } OpInfo.AssignedRegs.getCopyToRegs(InOperandVal, DAG, getCurDebugLoc(), Chain, &Flag); diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index 44f62ab..c7cc695 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -1355,7 +1355,7 @@ SelectInlineAsmMemoryOperands(std::vector<SDValue> &Ops) { std::vector<SDValue> SelOps; if (SelectInlineAsmMemoryOperand(InOps[i+1], 'm', SelOps)) report_fatal_error("Could not match memory address. Inline asm" - " failure!"); + " failure!"); // Add this to the output node. unsigned NewFlags = |