[llvm-commits] [llvm] r104664 - in /llvm/trunk: include/llvm/CodeGen/MachineFunction.h lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp lib/CodeGen/StackSlotColoring.cpp
Eric Christopher
echristo at apple.com
Tue May 25 18:59:55 PDT 2010
Author: echristo
Date: Tue May 25 20:59:55 2010
New Revision: 104664
URL: http://llvm.org/viewvc/llvm-project?rev=104664&view=rev
Log:
Temporarily revert r104655 as it's breaking the bots.
Modified:
llvm/trunk/include/llvm/CodeGen/MachineFunction.h
llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
llvm/trunk/lib/CodeGen/StackSlotColoring.cpp
Modified: llvm/trunk/include/llvm/CodeGen/MachineFunction.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineFunction.h?rev=104664&r1=104663&r2=104664&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/MachineFunction.h (original)
+++ llvm/trunk/include/llvm/CodeGen/MachineFunction.h Tue May 25 20:59:55 2010
@@ -114,13 +114,9 @@
///
unsigned FunctionNumber;
- /// Alignment - The alignment of the function.
+ /// The alignment of the function.
unsigned Alignment;
- /// HasReturnsTwiceCall - Returns true if there's a call with a
- /// "returns_twice" attribute, like setjmp.
- bool HasReturnsTwiceCall;
-
MachineFunction(const MachineFunction &); // DO NOT IMPLEMENT
void operator=(const MachineFunction&); // DO NOT IMPLEMENT
public:
@@ -185,15 +181,6 @@
void EnsureAlignment(unsigned A) {
if (Alignment < A) Alignment = A;
}
-
- /// hasReturnsTwiceCall - Returns true if there's a call with a
- /// "returns_twice" attribute, like setjmp.
- bool hasReturnsTwiceCall() const {
- return HasReturnsTwiceCall;
- }
- void setReturnsTwiceCall(bool B) {
- HasReturnsTwiceCall = B;
- }
/// getInfo - Keep track of various per-function pieces of information for
/// backends that would like to do so.
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=104664&r1=104663&r2=104664&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Tue May 25 20:59:55 2010
@@ -25,7 +25,6 @@
#include "llvm/Intrinsics.h"
#include "llvm/IntrinsicInst.h"
#include "llvm/LLVMContext.h"
-#include "llvm/Module.h"
#include "llvm/CodeGen/FastISel.h"
#include "llvm/CodeGen/GCStrategy.h"
#include "llvm/CodeGen/GCMetadata.h"
@@ -254,39 +253,6 @@
done:;
}
- // Set a flag indicating if the machine function makes a call to setjmp /
- // sigsetjmp (i.e., a function marked "returns_twice"). We'll use this to
- // disable certain optimizations which cannot handle such control flows.
- //
- // FIXME: This goes beyond the setjmp/sigsetjmp functions. We should check for
- // the GCC "returns twice" attribute.
- const Module *M = Fn.getParent();
- const Function *SetJmp = M->getFunction("setjmp");
- const Function *SigSetJmp = M->getFunction("sigsetjmp");
- bool HasReturnsTwiceCall = false;
-
- if (SetJmp || SigSetJmp) {
- if (SetJmp && !SetJmp->use_empty())
- for (Value::const_use_iterator
- I = SetJmp->use_begin(), E = SetJmp->use_end(); I != E; ++I)
- if (const CallInst *CI = dyn_cast<CallInst>(I))
- if (CI->getParent()->getParent() == &Fn) {
- HasReturnsTwiceCall = true;
- break;
- }
-
- if (!HasReturnsTwiceCall && SigSetJmp && !SigSetJmp->use_empty())
- for (Value::const_use_iterator
- I = SigSetJmp->use_begin(), E = SigSetJmp->use_end(); I != E; ++I)
- if (const CallInst *CI = dyn_cast<CallInst>(I))
- if (CI->getParent()->getParent() == &Fn) {
- HasReturnsTwiceCall = true;
- break;
- }
-
- mf.setReturnsTwiceCall(HasReturnsTwiceCall);
- }
-
// Release function-specific state. SDB and CurDAG are already cleared
// at this point.
FuncInfo->clear();
Modified: llvm/trunk/lib/CodeGen/StackSlotColoring.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/StackSlotColoring.cpp?rev=104664&r1=104663&r2=104664&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/StackSlotColoring.cpp (original)
+++ llvm/trunk/lib/CodeGen/StackSlotColoring.cpp Tue May 25 20:59:55 2010
@@ -118,6 +118,7 @@
private:
void InitializeSlots();
+ bool CheckForSetJmpCall(const MachineFunction &MF) const;
void ScanForSpillSlotRefs(MachineFunction &MF);
bool OverlapWithAssignments(LiveInterval *li, int Color) const;
int ColorSlot(LiveInterval *li);
@@ -161,6 +162,34 @@
};
}
+/// CheckForSetJmpCall - Return true if there's a call to setjmp/sigsetjmp in
+/// this function.
+bool StackSlotColoring::CheckForSetJmpCall(const MachineFunction &MF) const {
+ const Function *F = MF.getFunction();
+ const Module *M = F->getParent();
+ const Function *SetJmp = M->getFunction("setjmp");
+ const Function *SigSetJmp = M->getFunction("sigsetjmp");
+
+ if (!SetJmp && !SigSetJmp)
+ return false;
+
+ if (SetJmp && !SetJmp->use_empty())
+ for (Value::const_use_iterator
+ I = SetJmp->use_begin(), E = SetJmp->use_end(); I != E; ++I)
+ if (const CallInst *CI = dyn_cast<CallInst>(I))
+ if (CI->getParent()->getParent() == F)
+ return true;
+
+ if (SigSetJmp && !SigSetJmp->use_empty())
+ for (Value::const_use_iterator
+ I = SigSetJmp->use_begin(), E = SigSetJmp->use_end(); I != E; ++I)
+ if (const CallInst *CI = dyn_cast<CallInst>(I))
+ if (CI->getParent()->getParent() == F)
+ return true;
+
+ return false;
+}
+
/// ScanForSpillSlotRefs - Scan all the machine instructions for spill slot
/// references and update spill slot weights.
void StackSlotColoring::ScanForSpillSlotRefs(MachineFunction &MF) {
@@ -724,11 +753,14 @@
return false;
}
- // If there is a call to a function with the attribute "returns_twice" (like
- // setjmp or sigsetjmp), don't perform stack slot coloring. The stack could be
- // modified before the the second return, resulting in the wrong value being
- // used afterwards. (See <rdar://problem/8007500>.)
- if (MF.hasReturnsTwiceCall())
+ // If there are calls to setjmp or sigsetjmp, don't perform stack slot
+ // coloring. The stack could be modified before the longjmp is executed,
+ // resulting in the wrong value being used afterwards. (See
+ // <rdar://problem/8007500>.)
+ //
+ // FIXME: This goes beyond the setjmp/sigsetjmp functions. Ideally, we should
+ // check for the GCC "returns twice" attribute.
+ if (CheckForSetJmpCall(MF))
return false;
// Gather spill slot references
More information about the llvm-commits
mailing list