[llvm] r250072 - [llvm-symbolizer] Reverting r250067

[Colin LeMahieu via llvm-commits]

Author: colinl
Date: Mon Oct 12 12:57:02 2015
New Revision: 250072

URL: http://llvm.org/viewvc/llvm-project?rev=250072&view=rev
Log:
[llvm-symbolizer] Reverting r250067

Removed:
    llvm/trunk/test/tools/llvm-symbolizer/Inputs/addr.inp
    llvm/trunk/test/tools/llvm-symbolizer/sym.test
Modified:
    llvm/trunk/docs/CommandGuide/llvm-symbolizer.rst
    llvm/trunk/include/llvm/MC/MCParser/MCAsmLexer.h
    llvm/trunk/tools/llvm-symbolizer/llvm-symbolizer.cpp

Modified: llvm/trunk/docs/CommandGuide/llvm-symbolizer.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CommandGuide/llvm-symbolizer.rst?rev=250072&r1=250071&r2=250072&view=diff
==============================================================================
--- llvm/trunk/docs/CommandGuide/llvm-symbolizer.rst (original)
+++ llvm/trunk/docs/CommandGuide/llvm-symbolizer.rst Mon Oct 12 12:57:02 2015
@@ -98,8 +98,6 @@ OPTIONS
  location, look for the debug info at the .dSYM path provided via the
  ``-dsym-hint`` flag. This flag can be used multiple times.
 
-.. option:: -print-address
- Print address before the source code location. Defaults to false.
 
 EXIT STATUS
 -----------

Modified: llvm/trunk/include/llvm/MC/MCParser/MCAsmLexer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCParser/MCAsmLexer.h?rev=250072&r1=250071&r2=250072&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCParser/MCAsmLexer.h (original)
+++ llvm/trunk/include/llvm/MC/MCParser/MCAsmLexer.h Mon Oct 12 12:57:02 2015
@@ -189,13 +189,13 @@ public:
   }
 
   /// Get the kind of current token.
-  AsmToken::TokenKind getKind() const { return CurTok.getKind(); }
+  AsmToken::TokenKind getKind() const { return getTok().getKind(); }
 
   /// Check if the current token has kind \p K.
-  bool is(AsmToken::TokenKind K) const { return CurTok.is(K); }
+  bool is(AsmToken::TokenKind K) const { return getTok().is(K); }
 
   /// Check if the current token has kind \p K.
-  bool isNot(AsmToken::TokenKind K) const { return CurTok.isNot(K); }
+  bool isNot(AsmToken::TokenKind K) const { return getTok().isNot(K); }
 
   /// Set whether spaces should be ignored by the lexer
   void setSkipSpace(bool val) { SkipSpace = val; }

Removed: llvm/trunk/test/tools/llvm-symbolizer/Inputs/addr.inp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-symbolizer/Inputs/addr.inp?rev=250071&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-symbolizer/Inputs/addr.inp (original)
+++ llvm/trunk/test/tools/llvm-symbolizer/Inputs/addr.inp (removed)
@@ -1 +0,0 @@
-0x40054d

Removed: llvm/trunk/test/tools/llvm-symbolizer/sym.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-symbolizer/sym.test?rev=250071&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-symbolizer/sym.test (original)
+++ llvm/trunk/test/tools/llvm-symbolizer/sym.test (removed)
@@ -1,19 +0,0 @@
-#Source:
-##include <stdio.h>
-#static inline int inc (int *a) {
-#  printf ("%d\n",(*a)++);
-#  return (*a)++;
-#}
-#
-#int main () {
-#  int x = 1;
-#  return inc(&x);
-#}
-#Build as : clang -g -O2 addr.c
-
-RUN: llvm-symbolizer -inlining -print-address -obj=%p/Inputs/addr.exe < %p/Inputs/addr.inp | FileCheck %s
-
-#CHECK: 0x40054d
-#CHECK: main
-#CHECK: {{[/\]+}}tmp{{[/\]+}}x.c:9:0
-

Modified: llvm/trunk/tools/llvm-symbolizer/llvm-symbolizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-symbolizer/llvm-symbolizer.cpp?rev=250072&r1=250071&r2=250072&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-symbolizer/llvm-symbolizer.cpp (original)
+++ llvm/trunk/tools/llvm-symbolizer/llvm-symbolizer.cpp Mon Oct 12 12:57:02 2015
@@ -73,9 +73,6 @@ static cl::list<std::string>
 ClDsymHint("dsym-hint", cl::ZeroOrMore,
            cl::desc("Path to .dSYM bundles to search for debug info for the "
                     "object files"));
-static cl::opt<bool>
-    ClPrintAddress("print-address", cl::init(false),
-                   cl::desc("Show address before line information"));
 
 static bool parseCommand(bool &IsData, std::string &ModuleName,
                          uint64_t &ModuleOffset) {
@@ -155,11 +152,6 @@ int main(int argc, char **argv) {
     std::string Result =
         IsData ? Symbolizer.symbolizeData(ModuleName, ModuleOffset)
                : Symbolizer.symbolizeCode(ModuleName, ModuleOffset);
-    if (ClPrintAddress) {
-      outs() << "0x";
-      outs().write_hex(ModuleOffset);
-      outs() << "\n";
-    }
     outs() << Result << "\n";
     outs().flush();
   }