[llvm] r244536 - MIR Parser: Report an error when a stack object is redefined.

[Alex Lorenz via llvm-commits]

Author: arphaman
Date: Mon Aug 10 18:50:41 2015
New Revision: 244536

URL: http://llvm.org/viewvc/llvm-project?rev=244536&view=rev
Log:
MIR Parser: Report an error when a stack object is redefined.

Added:
    llvm/trunk/test/CodeGen/MIR/X86/stack-object-redefinition-error.mir
Modified:
    llvm/trunk/include/llvm/CodeGen/MIRYamlMapping.h
    llvm/trunk/lib/CodeGen/MIRParser/MIRParser.cpp

Modified: llvm/trunk/include/llvm/CodeGen/MIRYamlMapping.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MIRYamlMapping.h?rev=244536&r1=244535&r2=244536&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/MIRYamlMapping.h (original)
+++ llvm/trunk/include/llvm/CodeGen/MIRYamlMapping.h Mon Aug 10 18:50:41 2015
@@ -204,7 +204,7 @@ template <> struct MappingTraits<Machine
 /// objects (Serialize local objects).
 struct MachineStackObject {
   enum ObjectType { DefaultType, SpillSlot, VariableSized };
-  unsigned ID;
+  UnsignedValue ID;
   StringValue Name;
   // TODO: Serialize unnamed LLVM alloca reference.
   ObjectType Type = DefaultType;

Modified: llvm/trunk/lib/CodeGen/MIRParser/MIRParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MIRParser/MIRParser.cpp?rev=244536&r1=244535&r2=244536&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MIRParser/MIRParser.cpp (original)
+++ llvm/trunk/lib/CodeGen/MIRParser/MIRParser.cpp Mon Aug 10 18:50:41 2015
@@ -521,8 +521,11 @@ bool MIRParserImpl::initializeFrameInfo(
           Object.Size, Object.Alignment,
           Object.Type == yaml::MachineStackObject::SpillSlot, Alloca);
     MFI.setObjectOffset(ObjectIdx, Object.Offset);
-    // TODO: Report an error when objects are redefined.
-    PFS.StackObjectSlots.insert(std::make_pair(Object.ID, ObjectIdx));
+    if (!PFS.StackObjectSlots.insert(std::make_pair(Object.ID.Value, ObjectIdx))
+             .second)
+      return error(Object.ID.SourceRange.Start,
+                   Twine("redefinition of stack object '%stack.") +
+                       Twine(Object.ID.Value) + "'");
     if (parseCalleeSavedRegister(MF, PFS, CSIInfo, Object.CalleeSavedRegister,
                                  ObjectIdx))
       return true;

Added: llvm/trunk/test/CodeGen/MIR/X86/stack-object-redefinition-error.mir
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/MIR/X86/stack-object-redefinition-error.mir?rev=244536&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/MIR/X86/stack-object-redefinition-error.mir (added)
+++ llvm/trunk/test/CodeGen/MIR/X86/stack-object-redefinition-error.mir Mon Aug 10 18:50:41 2015
@@ -0,0 +1,38 @@
+# RUN: not llc -march=x86-64 -start-after branch-folder -stop-after branch-folder -o /dev/null %s 2>&1 | FileCheck %s
+
+--- |
+
+  define i32 @test(i32 %a) #0 {
+  entry:
+    %b = alloca i32
+    %x = alloca i64
+    store i32 %a, i32* %b
+    store i64 2, i64* %x
+    %c = load i32, i32* %b
+    ret i32 %c
+  }
+
+  attributes #0 = { "no-frame-pointer-elim"="false" }
+
+...
+---
+name:            test
+tracksRegLiveness: true
+liveins:
+  - { reg: '%edi' }
+frameInfo:
+  maxAlignment:    8
+stack:
+  - { id: 0, name: b, offset: -12, size: 4, alignment: 4 }
+# CHECK: [[@LINE+1]]:11: redefinition of stack object '%stack.0'
+  - { id: 0, name: x, offset: -24, size: 8, alignment: 8 }
+body:
+  - id:              0
+    name:            entry
+    liveins:         [ '%edi' ]
+    instructions:
+      - 'MOV32mr %rsp, 1, _, -4, _, killed %edi'
+      - 'MOV64mi32 %rsp, 1, _, -16, _, 2'
+      - '%eax = MOV32rm %rsp, 1, _, -4, _'
+      - 'RETQ %eax'
+...