diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp
index 3d7d20d..4a9a62a 100644
--- a/lib/CodeGen/MachineFunction.cpp
+++ b/lib/CodeGen/MachineFunction.cpp
@@ -479,11 +479,11 @@
   if (!ShouldClamp || PrefAlign <= StackAlign)
     return PrefAlign;
   if (Alloca && MinAlign > StackAlign)
-    Alloca->getParent()->getContext().emitError(Alloca,
-        "Requested Minimal Alignment exceeds the Stack Alignment!");
+    Alloca->getParent()->getContext().emitWarning(Alloca,
+        "Requested alignment exceeds the stack alignment!");
   else
     assert(MinAlign <= StackAlign &&
-           "Requested Minimal Alignment exceeds the Stack Alignment!");
+           "Requested alignment exceeds the stack alignment!");
   return StackAlign;
 }