From 9c2d52014c95cef4aa0cf7e39ed47a42643c9568 Mon Sep 17 00:00:00 2001
From: James Y Knight <jyknight@google.com>
Date: Sat, 2 Jun 2018 02:44:10 +0000
Subject: Fix support for distinguishing archive members by timestamp on
 Darwin.

On Darwin, the binary's symbol table points to debug info in object
files -- potentially object files within a static library. Such a
library may have multiple entries with the same name, distinguished
only by timestamp.

The code was already _attempting_ to handle this case (see the code in
ObjectContainerBSDArchive::Archive::FindObject which disambiguates via
timestamp). But, unfortunately, while the timestamp was taken into
account on the _first_ lookup, the result was then cached in a map
keyed only off of the path.

Added the timestamp to the cache, and added a test case.

Differential Revision: https://reviews.llvm.org/D47660

llvm-svn: 333813
---
 .../test/macosx/duplicate-archive-members/Makefile | 22 ++++++++
 .../TestDuplicateMembers.py                        | 62 ++++++++++++++++++++++
 .../test/macosx/duplicate-archive-members/a.c      | 14 +++++
 .../test/macosx/duplicate-archive-members/main.c   | 17 ++++++
 .../test/macosx/duplicate-archive-members/sub1/a.c | 14 +++++
 5 files changed, 129 insertions(+)
 create mode 100644 lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/Makefile
 create mode 100644 lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/TestDuplicateMembers.py
 create mode 100644 lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/a.c
 create mode 100644 lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/main.c
 create mode 100644 lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/sub1/a.c

(limited to 'lldb/packages/Python/lldbsuite/test/macosx')

diff --git a/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/Makefile
new file mode 100644
index 00000000000..5bb3a3ce3f1
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/Makefile
@@ -0,0 +1,22 @@
+LEVEL = ../../make
+
+C_SOURCES := main.c
+
+# Make an archive that has two object files with the same name, but
+# different timestamps. Do it all in one rule so that the timestamps
+# can be controlled without confusing Make.
+libfoo.a: a.c sub1/a.c
+	$(CC) $(CFLAGS) -c $(<D)/a.c -o a.o
+	mkdir -p sub1
+	$(CC) $(CFLAGS) -c $(<D)/sub1/a.c -o sub1/a.o
+	touch -t '198001010000.00' a.o
+	touch -t '198001010000.01' sub1/a.o
+	$(AR) $(ARFLAGS) $@ a.o sub1/a.o
+	rm a.o sub1/a.o
+
+include $(LEVEL)/Makefile.rules
+
+# Needs to come after include
+OBJECTS += libfoo.a
+$(EXE) : libfoo.a
+.DEFAULT_GOAL := $(EXE)
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/TestDuplicateMembers.py b/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/TestDuplicateMembers.py
new file mode 100644
index 00000000000..9d36639d955
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/TestDuplicateMembers.py
@@ -0,0 +1,62 @@
+"""Test breaking inside functions defined within a BSD archive file libfoo.a."""
+
+from __future__ import print_function
+
+
+import os
+import time
+import lldb
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+
+class BSDArchivesTestCase(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    def setUp(self):
+        # Call super's setUp().
+        TestBase.setUp(self)
+        # Find the line number in a(int) to break at.
+        self.line = line_number(
+            'a.c', '// Set file and line breakpoint inside a().')
+
+    @expectedFailureAll(
+        oslist=["windows"],
+        bugnumber="llvm.org/pr24527.  Makefile.rules doesn't know how to build static libs on Windows")
+    def test(self):
+        """Break inside a() and b() defined within libfoo.a."""
+        self.build()
+
+        exe = self.getBuildArtifact("a.out")
+        self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
+
+        # Break on a() and b() symbols
+        lldbutil.run_break_set_by_symbol(
+            self, "a", sym_exact=True)
+        lldbutil.run_break_set_by_symbol(
+            self, "b", sym_exact=True)
+
+        self.runCmd("run", RUN_SUCCEEDED)
+
+        # The stop reason of the thread should be breakpoint.
+        self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
+                    substrs=['stopped',
+                             'stop reason = breakpoint'])
+
+        # Break at a(int) first.
+        self.expect("frame variable", VARIABLES_DISPLAYED_CORRECTLY,
+                    substrs=['(int) arg = 1'])
+        self.expect("frame variable __a_global", VARIABLES_DISPLAYED_CORRECTLY,
+                    substrs=['(int) __a_global = 1'])
+
+        # Continue the program, we should break at b(int) next.
+        self.runCmd("continue")
+        self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
+                    substrs=['stopped',
+                             'stop reason = breakpoint'])
+        self.expect("frame variable", VARIABLES_DISPLAYED_CORRECTLY,
+                    substrs=['(int) arg = 2'])
+        self.expect("frame variable __b_global", VARIABLES_DISPLAYED_CORRECTLY,
+                    substrs=['(int) __b_global = 2'])
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/a.c b/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/a.c
new file mode 100644
index 00000000000..402a6270c9c
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/a.c
@@ -0,0 +1,14 @@
+//===-- a.c -----------------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+int __a_global = 1;
+
+int a(int arg) {
+    int result = arg + __a_global;
+    return result;
+}
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/main.c b/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/main.c
new file mode 100644
index 00000000000..c5b1cc2f0d1
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/main.c
@@ -0,0 +1,17 @@
+//===-- main.c --------------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+#include <stdio.h>
+
+extern int a(int);
+extern int b(int);
+int main (int argc, char const *argv[])
+{
+    printf ("a(1) returns %d\n", a(1));
+    printf ("b(2) returns %d\n", b(2));
+}
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/sub1/a.c b/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/sub1/a.c
new file mode 100644
index 00000000000..814d4e8b44e
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/sub1/a.c
@@ -0,0 +1,14 @@
+//===-- a.c -----------------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+static int __b_global = 2;
+
+int b(int arg) {
+    int result = arg + __b_global;
+    return result;
+}
-- 
cgit v1.2.3