[llvm-commits] [llvm] r143521 - in /llvm/trunk: lib/MC/MCContext.cpp test/MC/MachO/file.s

[Kevin Enderby]

Author: enderby
Date: Tue Nov  1 18:39:05 2011
New Revision: 143521

URL: http://llvm.org/viewvc/llvm-project?rev=143521&view=rev
Log:
Fixed a bug in the code to create a dwarf file and directory table entires when
it is separating the directory part from the basename of the FileName.  Noticed 
that this:

  .file 1 "dir/foo"

when assembled got the two parts switched.  Using the Mac OS X dwarfdump tool
it can be seen easily:

% dwarfdump -a a.out
include_directories[  1] = 'foo'
                Dir  Mod Time   File Len   File Name
                ---- ---------- ---------- ---------------------------
file_names[  1]    1 0x00000000 0x00000000 dir
...

Which should be:
...
include_directories[  1] = 'dir'
                Dir  Mod Time   File Len   File Name
                ---- ---------- ---------- ---------------------------
file_names[  1]    1 0x00000000 0x00000000 foo

Added:
    llvm/trunk/test/MC/MachO/file.s
Modified:
    llvm/trunk/lib/MC/MCContext.cpp

Modified: llvm/trunk/lib/MC/MCContext.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCContext.cpp?rev=143521&r1=143520&r2=143521&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCContext.cpp (original)
+++ llvm/trunk/lib/MC/MCContext.cpp Tue Nov  1 18:39:05 2011
@@ -273,8 +273,10 @@
     // Separate the directory part from the basename of the FileName.
     std::pair<StringRef, StringRef> Slash = FileName.rsplit('/');
     Directory = Slash.second;
-    if (!Directory.empty())
-      FileName = Slash.first;
+    if (!Directory.empty()) {
+      Directory = Slash.first;
+      FileName = Slash.second;
+    }
   }
 
   // Find or make a entry in the MCDwarfDirs vector for this Directory.

Added: llvm/trunk/test/MC/MachO/file.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/MachO/file.s?rev=143521&view=auto
==============================================================================
--- llvm/trunk/test/MC/MachO/file.s (added)
+++ llvm/trunk/test/MC/MachO/file.s Tue Nov  1 18:39:05 2011
@@ -0,0 +1,22 @@
+// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | macho-dump --dump-section-data | FileCheck %s
+
+        .file	1 "dir/foo"
+        nop
+
+// CHECK:         ('_section_data', '90')
+// CHECK-NEXT:      # Section 1
+// CHECK-NEXT:     (('section_name', '__debug_line\x00\x00\x00\x00')
+// CHECK-NEXT:      ('segment_name', '__DWARF\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+// CHECK-NEXT:      ('address', 1)
+// CHECK-NEXT:      ('size', 45)
+// CHECK-NEXT:      ('offset', 221)
+// CHECK-NEXT:      ('alignment', 0)
+// CHECK-NEXT:      ('reloc_offset', 0)
+// CHECK-NEXT:      ('num_reloc', 0)
+// CHECK-NEXT:      ('flags', 0x2000000)
+// CHECK-NEXT:      ('reserved1', 0)
+// CHECK-NEXT:      ('reserved2', 0)
+// CHECK-NEXT:     ),
+// CHECK-NEXT:    ('_relocations', [
+// CHECK-NEXT:    ])
+// CHECK-NEXT:    ('_section_data', '29000000 02001e00 00000101 fb0e0d00 01010101 00000001 00000164 69720000 666f6f00 01000000 02000001 01')