[PATCH] D39544: [ELF] - Linkerscript: fixed non-determinism when handling MEMORY.

[George Rimar via Phabricator via llvm-commits]

grimar updated this revision to Diff 121286.
grimar added a comment.

- Improved testcase.
- Fixed using of destroyed object happened when doing `Script->MemoryRegions[Alias] = Script->MemoryRegions[Name];`, where MemoryRegions is MapVector. Right side returned reference to element of internal vector and it was resized and invalidated when called operator[] for left side assignment, so dead value was assigned finally.


https://reviews.llvm.org/D39544

Files:
  ELF/LinkerScript.h
  ELF/ScriptParser.cpp
  test/ELF/linkerscript/memory3.s


Index: test/ELF/linkerscript/memory3.s
===================================================================
--- test/ELF/linkerscript/memory3.s
+++ test/ELF/linkerscript/memory3.s
@@ -0,0 +1,23 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
+# RUN: echo "MEMORY { ram2 (ax) : ORIGIN = 0x1000, LENGTH = 1K   \
+# RUN:                ram1 (ax) : ORIGIN = 0x4000, LENGTH = 1K } \
+# RUN: SECTIONS {}" > %t1.script
+# RUN: ld.lld -o %t1 --script %t1.script %t
+# RUN: llvm-objdump -section-headers %t1 | FileCheck %s
+
+# RUN: echo "MEMORY { ram1 (ax) : ORIGIN = 0x1000, LENGTH = 1K   \
+# RUN:                ram2 (ax) : ORIGIN = 0x4000, LENGTH = 1K } \
+# RUN: SECTIONS {}" > %t2.script
+# RUN: ld.lld -o %t2 --script %t2.script %t
+# RUN: llvm-objdump -section-headers %t2 | FileCheck %s
+
+## Check we place .text into first defined memory region with appropriate flags.
+# CHECK: Sections:
+# CHECK: Idx Name  Size      Address
+# CHECK:   0       00000000 0000000000000000
+# CHECK:   1 .text 00000001 0000000000001000
+  
+.section .text.foo,"ax",%progbits
+foo:
+  nop
Index: ELF/ScriptParser.cpp
===================================================================
--- ELF/ScriptParser.cpp
+++ ELF/ScriptParser.cpp
@@ -422,7 +422,7 @@
     setError("redefinition of memory region '" + Alias + "'");
   if (!Script->MemoryRegions.count(Name))
     setError("memory region '" + Name + "' is not defined");
-  Script->MemoryRegions[Alias] = Script->MemoryRegions[Name];
+  Script->MemoryRegions.insert({Alias, Script->MemoryRegions[Name]});
 }
 
 void ScriptParser::readSearchDir() {
Index: ELF/LinkerScript.h
===================================================================
--- ELF/LinkerScript.h
+++ ELF/LinkerScript.h
@@ -277,7 +277,7 @@
   std::vector<InputSectionDescription *> KeptSections;
 
   // A map from memory region name to a memory region descriptor.
-  llvm::DenseMap<llvm::StringRef, MemoryRegion *> MemoryRegions;
+  llvm::MapVector<llvm::StringRef, MemoryRegion *> MemoryRegions;
 
   // A list of symbols referenced by the script.
   std::vector<llvm::StringRef> ReferencedSymbols;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D39544.121286.patch
Type: text/x-patch
Size: 2146 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171102/106af753/attachment.bin>