From: James Y Knight <jyknight@google.com>
Date: Wed, 27 Feb 2019 21:47:35 +0000 (+0000)
Subject: Fixup compilation/test failures after r354960 and r355013.
X-Git-Tag: llvmorg-9.0.0-rc1~11111
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f33b1f49b76adb79b3483a13cff69f18a6c4f28e;p=platform%2Fupstream%2Fllvm.git

Fixup compilation/test failures after r354960 and r355013.

llvm-svn: 355034
---

diff --git a/compiler-rt/lib/sanitizer_common/symbolizer/sanitizer_symbolize.cc b/compiler-rt/lib/sanitizer_common/symbolizer/sanitizer_symbolize.cc
index ede15f88a964..8150b7a09a0e 100644
--- a/compiler-rt/lib/sanitizer_common/symbolizer/sanitizer_symbolize.cc
+++ b/compiler-rt/lib/sanitizer_common/symbolizer/sanitizer_symbolize.cc
@@ -39,8 +39,9 @@ bool __sanitizer_symbolize_code(const char *ModuleName, uint64_t ModuleOffset,
     llvm::symbolize::DIPrinter Printer(OS);
     // TODO: it is neccessary to set proper SectionIndex here.
     // object::SectionedAddress::UndefSection works for only absolute addresses.
-    auto ResOrErr =
-        getDefaultSymbolizer()->symbolizeInlinedCode(ModuleName, {ModuleOffset, object::SectionedAddress::UndefSection});
+    auto ResOrErr = getDefaultSymbolizer()->symbolizeInlinedCode(
+        ModuleName,
+        {ModuleOffset, llvm::object::SectionedAddress::UndefSection});
     Printer << (ResOrErr ? ResOrErr.get() : llvm::DIInliningInfo());
   }
   return __sanitizer::internal_snprintf(Buffer, MaxLength, "%s",
@@ -55,8 +56,9 @@ bool __sanitizer_symbolize_data(const char *ModuleName, uint64_t ModuleOffset,
     llvm::symbolize::DIPrinter Printer(OS);
     // TODO: it is neccessary to set proper SectionIndex here.
     // object::SectionedAddress::UndefSection works for only absolute addresses.
-    auto ResOrErr =
-        getDefaultSymbolizer()->symbolizeData(ModuleName, {ModuleOffset, object::SectionedAddress::UndefSection});
+    auto ResOrErr = getDefaultSymbolizer()->symbolizeData(
+        ModuleName,
+        {ModuleOffset, llvm::object::SectionedAddress::UndefSection});
     Printer << (ResOrErr ? ResOrErr.get() : llvm::DIGlobal());
   }
   return __sanitizer::internal_snprintf(Buffer, MaxLength, "%s",
diff --git a/llvm/test/tools/llvm-readobj/thin-archive.test b/llvm/test/tools/llvm-readobj/thin-archive.test
index 3cdbaa51706d..3f103a7a01fb 100644
--- a/llvm/test/tools/llvm-readobj/thin-archive.test
+++ b/llvm/test/tools/llvm-readobj/thin-archive.test
@@ -50,6 +50,7 @@
 
 # Overwrite one of the members with a member of a different size to show that
 # the size field in the member header is not relevant.
+# RUN: rm -f %t/2.o
 # RUN: cp %t/1.o %t/2.o
 # RUN: llvm-readobj --file-headers %t.a | FileCheck %s --check-prefix=RESIZED