Virtual method calls are overrated.

llvm-svn: 15694

2 files changed, 6 insertions, 8 deletions

diff --git a/llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp b/llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp
index d837453e7bf..3716edb625d 100644
--- a/llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp
+++ b/llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp
@@ -2494,8 +2494,8 @@ static void CreateCodeForVariableSizeAlloca(const TargetMachine& target,
                                numElementsVal->getType(), isValid);
     assert(isValid && "Unexpectedly large array dimension in alloca!");
     int64_t total = numElem * tsize;
-    if (int extra= total % target.getFrameInfo()->getStackFrameSizeAlignment())
-      total += target.getFrameInfo()->getStackFrameSizeAlignment() - extra;
+    if (int extra= total % SparcV9FrameInfo::StackFrameSizeAlignment)
+      total += SparcV9FrameInfo::StackFrameSizeAlignment - extra;
     totalSizeVal = ConstantSInt::get(Type::IntTy, total);
   } else {
     // The size is not a constant.  Generate code to compute it and
diff --git a/llvm/lib/Target/SparcV9/SparcV9FrameInfo.cpp b/llvm/lib/Target/SparcV9/SparcV9FrameInfo.cpp
index 91b94883f69..6727aac29af 100644
--- a/llvm/lib/Target/SparcV9/SparcV9FrameInfo.cpp
+++ b/llvm/lib/Target/SparcV9/SparcV9FrameInfo.cpp
@@ -7,9 +7,7 @@
 // 
 //===----------------------------------------------------------------------===//
 // 
-// Interface to stack frame layout info for the UltraSPARC.  Starting offsets
-// for each area of the stack frame are aligned at a multiple of
-// getStackFrameSizeAlignment().
+// Interface to stack frame layout info for the UltraSPARC.
 // 
 //===----------------------------------------------------------------------===//
 
@@ -57,9 +55,9 @@ SparcV9FrameInfo::getDynamicAreaOffset(MachineFunction& mcInfo, bool& pos) const
   // dynamic-size alloca.
   pos = false;
   unsigned optArgsSize = mcInfo.getInfo()->getMaxOptionalArgsSize();
-  if (int extra = optArgsSize % getStackFrameSizeAlignment())
-    optArgsSize += (getStackFrameSizeAlignment() - extra);
+  if (int extra = optArgsSize % 16)
+    optArgsSize += (16 - extra);
   int offset = optArgsSize + FirstOptionalOutgoingArgOffsetFromSP;
-  assert((offset - OFFSET) % getStackFrameSizeAlignment() == 0);
+  assert((offset - OFFSET) % 16 == 0);
   return offset;
 }