commit 179821ac1f282ef6f8d24d5ea346028aee8ba4c7
author Rafael Espindola <rafael.espindola@gmail.com> Mon Dec 06 19:08:48 2010 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Mon Dec 06 19:08:48 2010 +0000
tree 25a5861add458a1bafe0a084a2cdc08827ffc48e
parent c76c59840b7a4491afdcd2f35483f8d6e5ab533a

Remove the instruction fragment to data fragment lowering since it was causing
freed data to be read. I will open a bug to track it being reenabled.

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

lib/Target/ARM/ARMAsmBackend.cpp

diff --git a/lib/Target/ARM/ARMAsmBackend.cpp b/lib/Target/ARM/ARMAsmBackend.cpp
index 392a6e6..536923e 100644
--- a/lib/Target/ARM/ARMAsmBackend.cpp
+++ b/lib/Target/ARM/ARMAsmBackend.cpp
@@ -138,7 +138,7 @@
     return Format;
   }
 
-  void ApplyFixup(const MCFixup &Fixup, MCDataFragment &DF,
+  void ApplyFixup(const MCFixup &Fixup, char *Data, unsigned DataSize,
                   uint64_t Value) const;
 
   MCObjectWriter *createObjectWriter(raw_ostream &OS) const {
@@ -150,8 +150,8 @@
 };
 
 // Fixme: Raise this to share code between Darwin and ELF.
-void ELFARMAsmBackend::ApplyFixup(const MCFixup &Fixup, MCDataFragment &DF,
-                                  uint64_t Value) const {
+void ELFARMAsmBackend::ApplyFixup(const MCFixup &Fixup, char *Data,
+                                  unsigned DataSize, uint64_t Value) const {
   // Fixme: 2 for Thumb
   unsigned NumBytes = 4;
   Value = adjustFixupValue(Fixup.getKind(), Value);
@@ -162,7 +162,7 @@
   // bits from the fixup value.
   // The Value has been "split up" into the appropriate bitfields above.
   for (unsigned i = 0; i != NumBytes; ++i) {
-    DF.getContents()[Fixup.getOffset() + i] |= uint8_t(Value >> (i * 8));
+    Data[Fixup.getOffset() + i] |= uint8_t(Value >> (i * 8));
   }
 }
 
@@ -179,7 +179,7 @@
     return Format;
   }
 
-  void ApplyFixup(const MCFixup &Fixup, MCDataFragment &DF,
+  void ApplyFixup(const MCFixup &Fixup, char *Data, unsigned DataSize,
                   uint64_t Value) const;
 
   MCObjectWriter *createObjectWriter(raw_ostream &OS) const {
@@ -207,17 +207,17 @@
   }
 }
 
-void DarwinARMAsmBackend::ApplyFixup(const MCFixup &Fixup, MCDataFragment &DF,
-                                     uint64_t Value) const {
+void DarwinARMAsmBackend::ApplyFixup(const MCFixup &Fixup, char *Data,
+                                     unsigned DataSize, uint64_t Value) const {
   unsigned NumBytes = getFixupKindNumBytes(Fixup.getKind());
   Value = adjustFixupValue(Fixup.getKind(), Value);
 
-  assert(Fixup.getOffset() + NumBytes <= DF.getContents().size() &&
+  assert(Fixup.getOffset() + NumBytes <= DataSize &&
          "Invalid fixup offset!");
   // For each byte of the fragment that the fixup touches, mask in the
   // bits from the fixup value.
   for (unsigned i = 0; i != NumBytes; ++i)
-    DF.getContents()[Fixup.getOffset() + i] |= uint8_t(Value >> (i * 8));
+    Data[Fixup.getOffset() + i] |= uint8_t(Value >> (i * 8));
 }
 } // end anonymous namespace