[llvm-branch-commits] [llvm-branch] r104656 - in /llvm/branches/Apple/Morbo: ./ include/llvm/CodeGen/MachineFunction.h lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp lib/CodeGen/StackSlotColoring.cpp lib/Target/ARM/ARMInstrFormats.td

Bill Wendling isanbard at gmail.com
Tue May 25 17:46:21 PDT 2010


Author: void
Date: Tue May 25 19:46:21 2010
New Revision: 104656

URL: http://llvm.org/viewvc/llvm-project?rev=104656&view=rev
Log:
$ svn merge -c 104655 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r104655 into '.':
U    include/llvm/CodeGen/MachineFunction.h
U    lib/CodeGen/StackSlotColoring.cpp
U    lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

Modified:
    llvm/branches/Apple/Morbo/   (props changed)
    llvm/branches/Apple/Morbo/include/llvm/CodeGen/MachineFunction.h
    llvm/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
    llvm/branches/Apple/Morbo/lib/CodeGen/StackSlotColoring.cpp
    llvm/branches/Apple/Morbo/lib/Target/ARM/ARMInstrFormats.td   (props changed)

Propchange: llvm/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 25 19:46:21 2010
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Hermes:96832,96835,96858,96870,96876,96879,104427
-/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98768,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99196,99223,99263,99282-99284,99306,99319-99321,99324,99336,99378,99418,99423,99429,99440,99455,99463,99465,99469,99484,99490,99492-99494,99507,99524,99537,99539-99540,99544,99570,99575,99598,99620,99629-99630,99636,99671,99692,99695,99697,99699,99722,99816,99835-99836,99845-99846,99848,99850,99855,99879,99881-99883,99895,99899,99910,99916,99919,99952-99954,99957,99959,99974-99975,99982,99984-99986,99988-99989,99992-99993,99995,99997-99999,100016,100035,100037-100038,100042,100044,100056,100072,100074,100078,100081-100090,100092,100094-100095,100116,100134,100184,100209,100214-100218,100220-100221,100223-100225,100231,100250,100252,100257,100261,100304,100332,100353,100384,100454-100455,100457,100466,100478,100480,100487,100494,100497,100505,100521,100553,100568,100584,100592,100609-100610,100636,100710,100736,10074
 2,100751,100768-100769,100771,100781,100797,100804,100837,100867,100892,100936-100937,101011,101023,101075,101077,101079,101081,101085,101154,101158,101162,101165,101181,101190,101202,101282,101294,101303,101314-101315,101317,101331,101343,101383,101392,101420,101453,101604,101615,101629,101684-101686,101805,101845,101847,101851,101855,101870,101879,101897,101925,101930,101965,101971,101979,102111,102120,102192,102202,102225,102236-102237,102358,102366,102394,102396,102405,102421,102454-102456,102463,102467-102468,102470,102481,102486-102488,102492-102493,102504-102505,102508-102510,102513,102519,102524,102526,102531,102558,102646,102653,102655,102661-102662,102672,102743,102760,102770,102791,102948,102970,102980,103001,103133,103233,103314,103356,103415,103419,103439,103451,103455,103459,103798,103801-103802,103804,103808,103813,103824,103829,103990,103995,104066,104236,104419,104531,104640,104646
+/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98768,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99196,99223,99263,99282-99284,99306,99319-99321,99324,99336,99378,99418,99423,99429,99440,99455,99463,99465,99469,99484,99490,99492-99494,99507,99524,99537,99539-99540,99544,99570,99575,99598,99620,99629-99630,99636,99671,99692,99695,99697,99699,99722,99816,99835-99836,99845-99846,99848,99850,99855,99879,99881-99883,99895,99899,99910,99916,99919,99952-99954,99957,99959,99974-99975,99982,99984-99986,99988-99989,99992-99993,99995,99997-99999,100016,100035,100037-100038,100042,100044,100056,100072,100074,100078,100081-100090,100092,100094-100095,100116,100134,100184,100209,100214-100218,100220-100221,100223-100225,100231,100250,100252,100257,100261,100304,100332,100353,100384,100454-100455,100457,100466,100478,100480,100487,100494,100497,100505,100521,100553,100568,100584,100592,100609-100610,100636,100710,100736,10074
 2,100751,100768-100769,100771,100781,100797,100804,100837,100867,100892,100936-100937,101011,101023,101075,101077,101079,101081,101085,101154,101158,101162,101165,101181,101190,101202,101282,101294,101303,101314-101315,101317,101331,101343,101383,101392,101420,101453,101604,101615,101629,101684-101686,101805,101845,101847,101851,101855,101870,101879,101897,101925,101930,101965,101971,101979,102111,102120,102192,102202,102225,102236-102237,102358,102366,102394,102396,102405,102421,102454-102456,102463,102467-102468,102470,102481,102486-102488,102492-102493,102504-102505,102508-102510,102513,102519,102524,102526,102531,102558,102646,102653,102655,102661-102662,102672,102743,102760,102770,102791,102948,102970,102980,103001,103133,103233,103314,103356,103415,103419,103439,103451,103455,103459,103798,103801-103802,103804,103808,103813,103824,103829,103990,103995,104066,104236,104419,104531,104640,104646,104655

Modified: llvm/branches/Apple/Morbo/include/llvm/CodeGen/MachineFunction.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/include/llvm/CodeGen/MachineFunction.h?rev=104656&r1=104655&r2=104656&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/include/llvm/CodeGen/MachineFunction.h (original)
+++ llvm/branches/Apple/Morbo/include/llvm/CodeGen/MachineFunction.h Tue May 25 19:46:21 2010
@@ -116,9 +116,13 @@
   ///
   unsigned FunctionNumber;
   
-  // The alignment of the function.
+  /// Alignment - 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
 
@@ -183,6 +187,15 @@
   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/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=104656&r1=104655&r2=104656&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Tue May 25 19:46:21 2010
@@ -28,6 +28,7 @@
 #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"
@@ -392,6 +393,41 @@
   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::use_const_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::use_const_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();
 
   return true;

Modified: llvm/branches/Apple/Morbo/lib/CodeGen/StackSlotColoring.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/CodeGen/StackSlotColoring.cpp?rev=104656&r1=104655&r2=104656&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/CodeGen/StackSlotColoring.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/CodeGen/StackSlotColoring.cpp Tue May 25 19:46:21 2010
@@ -118,7 +118,6 @@
 
   private:
     void InitializeSlots();
-    bool CheckForSetJmpCall(const MachineFunction &MF) const;
     void ScanForSpillSlotRefs(MachineFunction &MF);
     bool OverlapWithAssignments(LiveInterval *li, int Color) const;
     int ColorSlot(LiveInterval *li);
@@ -162,34 +161,6 @@
   };
 }
 
-/// 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) {
@@ -747,14 +718,11 @@
       return false;
   }
 
-  // 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))
+  // 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())
     return false;
 
   // Gather spill slot references

Propchange: llvm/branches/Apple/Morbo/lib/Target/ARM/ARMInstrFormats.td
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 25 19:46:21 2010
@@ -1 +1 @@
-/llvm/trunk/lib/Target/ARM/ARMInstrFormats.td:104419,104531,104640,104646
+/llvm/trunk/lib/Target/ARM/ARMInstrFormats.td:104419,104531,104640,104646,104655





More information about the llvm-branch-commits mailing list