[llvm-commits] [llvm] r112631 - in /llvm/trunk: include/llvm/CodeGen/FunctionLoweringInfo.h lib/CodeGen/AsmPrinter/DwarfDebug.cpp lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp test/FrontendC++/2010-08-31-ByValArg.cpp
Devang Patel
dpatel at apple.com
Tue Aug 31 12:41:04 PDT 2010
Author: dpatel
Date: Tue Aug 31 14:41:03 2010
New Revision: 112631
URL: http://llvm.org/viewvc/llvm-project?rev=112631&view=rev
Log:
Revert r112623. It is causing self host build failures.
Removed:
llvm/trunk/test/FrontendC++/2010-08-31-ByValArg.cpp
Modified:
llvm/trunk/include/llvm/CodeGen/FunctionLoweringInfo.h
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
llvm/trunk/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp
llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
Modified: llvm/trunk/include/llvm/CodeGen/FunctionLoweringInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/FunctionLoweringInfo.h?rev=112631&r1=112630&r2=112631&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/FunctionLoweringInfo.h (original)
+++ llvm/trunk/include/llvm/CodeGen/FunctionLoweringInfo.h Tue Aug 31 14:41:03 2010
@@ -77,9 +77,6 @@
/// anywhere in the function.
DenseMap<const AllocaInst*, int> StaticAllocaMap;
- /// ByValArgFrameIndexMap - Keep track of frame indices for byval arguments.
- DenseMap<const Argument*, int> ByValArgFrameIndexMap;
-
/// ArgDbgValues - A list of DBG_VALUE instructions created during isel for
/// function arguments that are inserted after scheduling is completed.
SmallVector<MachineInstr*, 8> ArgDbgValues;
@@ -141,13 +138,6 @@
assert(R == 0 && "Already initialized this value register!");
return R = CreateRegs(V->getType());
}
-
- /// setByValArgumentFrameIndex - Record frame index for the byval
- /// argument.
- void setByValArgumentFrameIndex(const Argument *A, int FI);
-
- /// getByValArgumentFrameIndex - Get frame index for the byval argument.
- int getByValArgumentFrameIndex(const Argument *A);
};
/// AddCatchInfo - Extract the personality and type infos from an eh.selector
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=112631&r1=112630&r2=112631&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Tue Aug 31 14:41:03 2010
@@ -1629,16 +1629,9 @@
bool updated = false;
// FIXME : Handle getNumOperands != 3
if (DVInsn->getNumOperands() == 3) {
- if (DVInsn->getOperand(0).isReg()) {
- const MachineOperand RegOp = DVInsn->getOperand(0);
- const TargetRegisterInfo *TRI = Asm->TM.getRegisterInfo();
- if (DVInsn->getOperand(1).isImm() &&
- TRI->getFrameRegister(*Asm->MF) == RegOp.getReg()) {
- addVariableAddress(DV, VariableDie, DVInsn->getOperand(1).getImm());
- updated = true;
- } else
- updated = addRegisterAddress(VariableDie, DVLabel, RegOp);
- }
+ if (DVInsn->getOperand(0).isReg())
+ updated =
+ addRegisterAddress(VariableDie, DVLabel, DVInsn->getOperand(0));
else if (DVInsn->getOperand(0).isImm())
updated = addConstantValue(VariableDie, DVLabel, DVInsn->getOperand(0));
else if (DVInsn->getOperand(0).isFPImm())
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp?rev=112631&r1=112630&r2=112631&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp Tue Aug 31 14:41:03 2010
@@ -254,29 +254,6 @@
return FirstReg;
}
-/// setByValArgumentFrameIndex - Record frame index for the byval
-/// argument. This overrides previous frame index entry for this argument,
-/// if any.
-void FunctionLoweringInfo::setByValArgumentFrameIndex(const Argument *A,
- int FI) {
- assert (A->hasByValAttr() && "Argument does not have byval attribute!");
- ByValArgFrameIndexMap[A] = FI;
-}
-
-/// getByValArgumentFrameIndex - Get frame index for the byval argument.
-/// This routine must be used after the argument's frame index is set.
-/// If the argument does not have any entry in the map then assertion
-/// will be raised.
-int FunctionLoweringInfo::getByValArgumentFrameIndex(const Argument *A) {
- assert (A->hasByValAttr() && "Argument does not have byval attribute!");
- DenseMap<const Argument *, int>::iterator I =
- ByValArgFrameIndexMap.find(A);
- assert (I != ByValArgFrameIndexMap.end() &&
- "Argument does not have assigned frame index!");
- return I->second;
-
-}
-
/// AddCatchInfo - Extract the personality and type infos from an eh.selector
/// call, and add them to the specified machine basic block.
void llvm::AddCatchInfo(const CallInst &I, MachineModuleInfo *MMI,
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=112631&r1=112630&r2=112631&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Tue Aug 31 14:41:03 2010
@@ -3917,8 +3917,7 @@
SelectionDAGBuilder::EmitFuncArgumentDbgValue(const Value *V, MDNode *Variable,
int64_t Offset,
const SDValue &N) {
- const Argument *Arg = dyn_cast<Argument>(V);
- if (!Arg)
+ if (!isa<Argument>(V))
return false;
MachineFunction &MF = DAG.getMachineFunction();
@@ -3932,14 +3931,6 @@
return false;
unsigned Reg = 0;
- if (Arg->hasByValAttr()) {
- // Byval arguments' frame index is recorded during argument lowering.
- // Use this info directly.
- const TargetRegisterInfo *TRI = DAG.getTarget().getRegisterInfo();
- Reg = TRI->getFrameRegister(MF);
- Offset = FuncInfo.getByValArgumentFrameIndex(Arg);
- }
-
if (N.getNode() && N.getOpcode() == ISD::CopyFromReg) {
Reg = cast<RegisterSDNode>(N.getOperand(1))->getReg();
if (Reg && TargetRegisterInfo::isVirtualRegister(Reg)) {
@@ -6140,12 +6131,6 @@
i += NumParts;
}
- // Note down frame index for byval arguments.
- if (I->hasByValAttr() && !ArgValues.empty())
- if (FrameIndexSDNode *FI =
- dyn_cast<FrameIndexSDNode>(ArgValues[0].getNode()))
- FuncInfo->setByValArgumentFrameIndex(I, FI->getIndex());
-
if (!I->use_empty()) {
SDValue Res;
if (!ArgValues.empty())
Removed: llvm/trunk/test/FrontendC++/2010-08-31-ByValArg.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC%2B%2B/2010-08-31-ByValArg.cpp?rev=112630&view=auto
==============================================================================
--- llvm/trunk/test/FrontendC++/2010-08-31-ByValArg.cpp (original)
+++ llvm/trunk/test/FrontendC++/2010-08-31-ByValArg.cpp (removed)
@@ -1,53 +0,0 @@
-// This regression test checks byval arguments' debug info.
-// Radar 8367011
-// RUN: %llvmgcc -S -O0 -g %s -o - | \
-// RUN: llc --disable-fp-elim -o %t.s -O0 -relocation-model=pic
-// RUN: %compile_c %t.s -o %t.o
-// RUN: %link %t.o -o %t.exe
-// RUN: echo {break get\nrun\np missing_arg.b} > %t.in
-// RUN: gdb -q -batch -n -x %t.in %t.exe | tee %t.out | \
-// RUN: grep {1 = 4242}
-
-// XTARGET: x86_64-apple-darwin
-
-class EVT {
-public:
- int a;
- int b;
- int c;
-};
-
-class VAL {
-public:
- int x;
- int y;
-};
-void foo(EVT e);
-EVT bar();
-
-void get(int *i, unsigned dl, VAL v, VAL *p, unsigned n, EVT missing_arg) {
-//CHECK: .ascii "missing_arg"
- EVT e = bar();
- if (dl == n)
- foo(missing_arg);
-}
-
-
-EVT bar() {
- EVT e;
- return e;
-}
-
-void foo(EVT e) {}
-
-int main(){
- VAL v;
- EVT ma;
- ma.a = 1;
- ma.b = 4242;
- ma.c = 3;
- int i = 42;
- get (&i, 1, v, &v, 2, ma);
- return 0;
-}
-
More information about the llvm-commits
mailing list