Revert 172027 and 174336. Remove diagnostics about over-aligned stack objects.

Aside from the question of whether we report a warning or an error when we
can't satisfy a requested stack object alignment, the current implementation
of this is not good.  We're not providing any source location in the diagnostics
and the current warning is not connected to any warning group so you can't
control it.  We could improve the source location somewhat, but we can do a
much better job if this check is implemented in the front-end, so let's do that
instead.  <rdar://problem/13127907>

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@174741 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 3 insertions, 16 deletions

diff --git a/include/llvm/CodeGen/MachineFrameInfo.h b/include/llvm/CodeGen/MachineFrameInfo.h
index 0748b9ab24..93d77287d7 100644
--- a/include/llvm/CodeGen/MachineFrameInfo.h
+++ b/include/llvm/CodeGen/MachineFrameInfo.h
@@ -493,23 +493,11 @@ public:
     return Objects[ObjectIdx+NumFixedObjects].Size == ~0ULL;
   }
 
-  /// CreateStackObjectWithMinAlign - Create a new statically sized stack
-  /// object, returning a nonnegative identifier to represent it. This function
-  /// takes a preferred alignment and a minimal alignment.
-  ///
-  int CreateStackObjectWithMinAlign(uint64_t Size, unsigned PrefAlignment,
-                        unsigned MinAlignment, bool isSS,
-                        bool MayNeedSP = false, const AllocaInst *Alloca = 0);
-
   /// CreateStackObject - Create a new statically sized stack object, returning
-  /// a nonnegative identifier to represent it. Will not emit an error when
-  /// Alignment can't be satisfied.
+  /// a nonnegative identifier to represent it.
   ///
   int CreateStackObject(uint64_t Size, unsigned Alignment, bool isSS,
-                        bool MayNeedSP = false, const AllocaInst *Alloca = 0) {
-    return CreateStackObjectWithMinAlign(Size, Alignment, 0, isSS,
-                                         MayNeedSP, Alloca);
-  }
+                        bool MayNeedSP = false, const AllocaInst *Alloca = 0);
 
   /// CreateSpillStackObject - Create a new statically sized stack object that
   /// represents a spill slot, returning a nonnegative identifier to represent
@@ -529,8 +517,7 @@ public:
   /// variable sized object is created, whether or not the index returned is
   /// actually used.
   ///
-  int CreateVariableSizedObject(unsigned PrefAlignment, unsigned MinAlignment,
-                                const AllocaInst *Alloca = 0);
+  int CreateVariableSizedObject(unsigned Alignment);
 
   /// getCalleeSavedInfo - Returns a reference to call saved info vector for the
   /// current function.