<div dir="ltr">Excellent, thanks!</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Mar 25, 2013 at 7:25 PM, Chandler Carruth <span dir="ltr"><<a href="mailto:chandlerc@gmail.com" target="_blank">chandlerc@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: chandlerc<br>
Date: Mon Mar 25 21:25:37 2013<br>
New Revision: 177971<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=177971&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=177971&view=rev</a><br>
Log:<br>
Split out the IRReader header and the utility functions it provides into<br>
its own library. These functions are bridging between the bitcode reader<br>
and the ll parser which are in different libraries. Previously we didn't<br>
have any good library to do this, and instead played fast and loose with<br>
a "header only" set of interfaces in the Support library. This really<br>
doesn't work well as evidenced by the recent attempt to add timing logic<br>
to the these routines.<br>
<br>
As part of this, make them normal functions rather than weird inline<br>
functions, and sink the implementation into the library. Also clean up<br>
the header to be nice and minimal.<br>
<br>
This requires updating lots of build system dependencies to specify that<br>
the IRReader library is needed, and several source files to not<br>
implicitly rely upon the header file to transitively include all manner<br>
of other headers.<br>
<br>
If you are using IRReader.h, this commit will break you (the header<br>
moved) and you'll need to also update your library usage to include<br>
'irreader'. I will commit the corresponding change to Clang momentarily.<br>
<br>
Added:<br>
llvm/trunk/include/llvm/IRReader/<br>
llvm/trunk/include/llvm/IRReader/IRReader.h<br>
llvm/trunk/lib/IRReader/<br>
llvm/trunk/lib/IRReader/CMakeLists.txt<br>
llvm/trunk/lib/IRReader/IRReader.cpp<br>
llvm/trunk/lib/IRReader/LLVMBuild.txt<br>
- copied, changed from r177968, llvm/trunk/tools/llvm-extract/LLVMBuild.txt<br>
llvm/trunk/lib/IRReader/Makefile<br>
- copied, changed from r177968, llvm/trunk/lib/Makefile<br>
Removed:<br>
llvm/trunk/include/llvm/Support/IRReader.h<br>
Modified:<br>
llvm/trunk/lib/CMakeLists.txt<br>
llvm/trunk/lib/LLVMBuild.txt<br>
llvm/trunk/lib/Makefile<br>
llvm/trunk/tools/bugpoint/BugDriver.cpp<br>
llvm/trunk/tools/bugpoint/CMakeLists.txt<br>
llvm/trunk/tools/bugpoint/LLVMBuild.txt<br>
llvm/trunk/tools/llc/CMakeLists.txt<br>
llvm/trunk/tools/llc/LLVMBuild.txt<br>
llvm/trunk/tools/llc/llc.cpp<br>
llvm/trunk/tools/lli/CMakeLists.txt<br>
llvm/trunk/tools/lli/LLVMBuild.txt<br>
llvm/trunk/tools/lli/lli.cpp<br>
llvm/trunk/tools/llvm-diff/CMakeLists.txt<br>
llvm/trunk/tools/llvm-diff/LLVMBuild.txt<br>
llvm/trunk/tools/llvm-diff/llvm-diff.cpp<br>
llvm/trunk/tools/llvm-extract/CMakeLists.txt<br>
llvm/trunk/tools/llvm-extract/LLVMBuild.txt<br>
llvm/trunk/tools/llvm-extract/llvm-extract.cpp<br>
llvm/trunk/tools/llvm-jitlistener/CMakeLists.txt<br>
llvm/trunk/tools/llvm-jitlistener/LLVMBuild.txt<br>
llvm/trunk/tools/llvm-jitlistener/llvm-jitlistener.cpp<br>
llvm/trunk/tools/llvm-link/CMakeLists.txt<br>
llvm/trunk/tools/llvm-link/LLVMBuild.txt<br>
llvm/trunk/tools/llvm-link/llvm-link.cpp<br>
llvm/trunk/tools/opt/CMakeLists.txt<br>
llvm/trunk/tools/opt/LLVMBuild.txt<br>
llvm/trunk/tools/opt/opt.cpp<br>
<br>
Added: llvm/trunk/include/llvm/IRReader/IRReader.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IRReader/IRReader.h?rev=177971&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IRReader/IRReader.h?rev=177971&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/IRReader/IRReader.h (added)<br>
+++ llvm/trunk/include/llvm/IRReader/IRReader.h Mon Mar 25 21:25:37 2013<br>
@@ -0,0 +1,55 @@<br>
+//===---- llvm/IRReader/IRReader.h - Reader for LLVM IR files ---*- C++ -*-===//<br>
+//<br>
+// The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+//<br>
+// This file defines functions for reading LLVM IR. They support both<br>
+// Bitcode and Assembly, automatically detecting the input format.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#ifndef LLVM_IRREADER_IRREADER_H<br>
+#define LLVM_IRREADER_IRREADER_H<br>
+<br>
+#include <string><br>
+<br>
+namespace llvm {<br>
+<br>
+class Module;<br>
+class MemoryBuffer;<br>
+class SMDiagnostic;<br>
+class LLVMContext;<br>
+<br>
+/// If the given MemoryBuffer holds a bitcode image, return a Module for it<br>
+/// which does lazy deserialization of function bodies. Otherwise, attempt to<br>
+/// parse it as LLVM Assembly and return a fully populated Module. This<br>
+/// function *always* takes ownership of the given MemoryBuffer.<br>
+Module *getLazyIRModule(MemoryBuffer *Buffer, SMDiagnostic &Err,<br>
+ LLVMContext &Context);<br>
+<br>
+/// If the given file holds a bitcode image, return a Module<br>
+/// for it which does lazy deserialization of function bodies. Otherwise,<br>
+/// attempt to parse it as LLVM Assembly and return a fully populated<br>
+/// Module.<br>
+Module *getLazyIRFileModule(const std::string &Filename, SMDiagnostic &Err,<br>
+ LLVMContext &Context);<br>
+<br>
+/// If the given MemoryBuffer holds a bitcode image, return a Module<br>
+/// for it. Otherwise, attempt to parse it as LLVM Assembly and return<br>
+/// a Module for it. This function *always* takes ownership of the given<br>
+/// MemoryBuffer.<br>
+Module *ParseIR(MemoryBuffer *Buffer, SMDiagnostic &Err, LLVMContext &Context);<br>
+<br>
+/// If the given file holds a bitcode image, return a Module for it.<br>
+/// Otherwise, attempt to parse it as LLVM Assembly and return a Module<br>
+/// for it.<br>
+Module *ParseIRFile(const std::string &Filename, SMDiagnostic &Err,<br>
+ LLVMContext &Context);<br>
+<br>
+}<br>
+<br>
+#endif<br>
<br>
Removed: llvm/trunk/include/llvm/Support/IRReader.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/IRReader.h?rev=177970&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/IRReader.h?rev=177970&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Support/IRReader.h (original)<br>
+++ llvm/trunk/include/llvm/Support/IRReader.h (removed)<br>
@@ -1,112 +0,0 @@<br>
-//===---- llvm/Support/IRReader.h - Reader for LLVM IR files ----*- C++ -*-===//<br>
-//<br>
-// The LLVM Compiler Infrastructure<br>
-//<br>
-// This file is distributed under the University of Illinois Open Source<br>
-// License. See LICENSE.TXT for details.<br>
-//<br>
-//===----------------------------------------------------------------------===//<br>
-//<br>
-// This file defines functions for reading LLVM IR. They support both<br>
-// Bitcode and Assembly, automatically detecting the input format.<br>
-//<br>
-// These functions must be defined in a header file in order to avoid<br>
-// library dependencies, since they reference both Bitcode and Assembly<br>
-// functions.<br>
-//<br>
-//===----------------------------------------------------------------------===//<br>
-<br>
-#ifndef LLVM_SUPPORT_IRREADER_H<br>
-#define LLVM_SUPPORT_IRREADER_H<br>
-<br>
-#include "llvm/ADT/OwningPtr.h"<br>
-#include "llvm/Assembly/Parser.h"<br>
-#include "llvm/Bitcode/ReaderWriter.h"<br>
-#include "llvm/Support/MemoryBuffer.h"<br>
-#include "llvm/Support/SourceMgr.h"<br>
-#include "llvm/Support/system_error.h"<br>
-<br>
-namespace llvm {<br>
-<br>
- /// If the given MemoryBuffer holds a bitcode image, return a Module for it<br>
- /// which does lazy deserialization of function bodies. Otherwise, attempt to<br>
- /// parse it as LLVM Assembly and return a fully populated Module. This<br>
- /// function *always* takes ownership of the given MemoryBuffer.<br>
- inline Module *getLazyIRModule(MemoryBuffer *Buffer,<br>
- SMDiagnostic &Err,<br>
- LLVMContext &Context) {<br>
- if (isBitcode((const unsigned char *)Buffer->getBufferStart(),<br>
- (const unsigned char *)Buffer->getBufferEnd())) {<br>
- std::string ErrMsg;<br>
- Module *M = getLazyBitcodeModule(Buffer, Context, &ErrMsg);<br>
- if (M == 0) {<br>
- Err = SMDiagnostic(Buffer->getBufferIdentifier(), SourceMgr::DK_Error,<br>
- ErrMsg);<br>
- // ParseBitcodeFile does not take ownership of the Buffer in the<br>
- // case of an error.<br>
- delete Buffer;<br>
- }<br>
- return M;<br>
- }<br>
-<br>
- return ParseAssembly(Buffer, 0, Err, Context);<br>
- }<br>
-<br>
- /// If the given file holds a bitcode image, return a Module<br>
- /// for it which does lazy deserialization of function bodies. Otherwise,<br>
- /// attempt to parse it as LLVM Assembly and return a fully populated<br>
- /// Module.<br>
- inline Module *getLazyIRFileModule(const std::string &Filename,<br>
- SMDiagnostic &Err,<br>
- LLVMContext &Context) {<br>
- OwningPtr<MemoryBuffer> File;<br>
- if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), File)) {<br>
- Err = SMDiagnostic(Filename, SourceMgr::DK_Error,<br>
- "Could not open input file: " + ec.message());<br>
- return 0;<br>
- }<br>
-<br>
- return getLazyIRModule(File.take(), Err, Context);<br>
- }<br>
-<br>
- /// If the given MemoryBuffer holds a bitcode image, return a Module<br>
- /// for it. Otherwise, attempt to parse it as LLVM Assembly and return<br>
- /// a Module for it. This function *always* takes ownership of the given<br>
- /// MemoryBuffer.<br>
- inline Module *ParseIR(MemoryBuffer *Buffer,<br>
- SMDiagnostic &Err,<br>
- LLVMContext &Context) {<br>
- if (isBitcode((const unsigned char *)Buffer->getBufferStart(),<br>
- (const unsigned char *)Buffer->getBufferEnd())) {<br>
- std::string ErrMsg;<br>
- Module *M = ParseBitcodeFile(Buffer, Context, &ErrMsg);<br>
- if (M == 0)<br>
- Err = SMDiagnostic(Buffer->getBufferIdentifier(), SourceMgr::DK_Error,<br>
- ErrMsg);<br>
- // ParseBitcodeFile does not take ownership of the Buffer.<br>
- delete Buffer;<br>
- return M;<br>
- }<br>
-<br>
- return ParseAssembly(Buffer, 0, Err, Context);<br>
- }<br>
-<br>
- /// If the given file holds a bitcode image, return a Module for it.<br>
- /// Otherwise, attempt to parse it as LLVM Assembly and return a Module<br>
- /// for it.<br>
- inline Module *ParseIRFile(const std::string &Filename,<br>
- SMDiagnostic &Err,<br>
- LLVMContext &Context) {<br>
- OwningPtr<MemoryBuffer> File;<br>
- if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), File)) {<br>
- Err = SMDiagnostic(Filename, SourceMgr::DK_Error,<br>
- "Could not open input file: " + ec.message());<br>
- return 0;<br>
- }<br>
-<br>
- return ParseIR(File.take(), Err, Context);<br>
- }<br>
-<br>
-}<br>
-<br>
-#endif<br>
<br>
Modified: llvm/trunk/lib/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CMakeLists.txt?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CMakeLists.txt?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CMakeLists.txt (original)<br>
+++ llvm/trunk/lib/CMakeLists.txt Mon Mar 25 21:25:37 2013<br>
@@ -1,6 +1,7 @@<br>
# `Support' and `TableGen' libraries are added on the top-level CMakeLists.txt<br>
<br>
add_subdirectory(IR)<br>
+add_subdirectory(IRReader)<br>
add_subdirectory(CodeGen)<br>
add_subdirectory(Bitcode)<br>
add_subdirectory(Transforms)<br>
<br>
Added: llvm/trunk/lib/IRReader/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IRReader/CMakeLists.txt?rev=177971&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IRReader/CMakeLists.txt?rev=177971&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IRReader/CMakeLists.txt (added)<br>
+++ llvm/trunk/lib/IRReader/CMakeLists.txt Mon Mar 25 21:25:37 2013<br>
@@ -0,0 +1,3 @@<br>
+add_llvm_library(LLVMIRReader<br>
+ IRReader.cpp<br>
+ )<br>
<br>
Added: llvm/trunk/lib/IRReader/IRReader.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IRReader/IRReader.cpp?rev=177971&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IRReader/IRReader.cpp?rev=177971&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IRReader/IRReader.cpp (added)<br>
+++ llvm/trunk/lib/IRReader/IRReader.cpp Mon Mar 25 21:25:37 2013<br>
@@ -0,0 +1,78 @@<br>
+//===---- IRReader.cpp - Reader for LLVM IR files -------------------------===//<br>
+//<br>
+// The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#include "llvm/IRReader/IRReader.h"<br>
+#include "llvm/ADT/OwningPtr.h"<br>
+#include "llvm/Assembly/Parser.h"<br>
+#include "llvm/Bitcode/ReaderWriter.h"<br>
+#include "llvm/Support/MemoryBuffer.h"<br>
+#include "llvm/Support/SourceMgr.h"<br>
+#include "llvm/Support/system_error.h"<br>
+<br>
+using namespace llvm;<br>
+<br>
+Module *llvm::getLazyIRModule(MemoryBuffer *Buffer, SMDiagnostic &Err,<br>
+ LLVMContext &Context) {<br>
+ if (isBitcode((const unsigned char *)Buffer->getBufferStart(),<br>
+ (const unsigned char *)Buffer->getBufferEnd())) {<br>
+ std::string ErrMsg;<br>
+ Module *M = getLazyBitcodeModule(Buffer, Context, &ErrMsg);<br>
+ if (M == 0) {<br>
+ Err = SMDiagnostic(Buffer->getBufferIdentifier(), SourceMgr::DK_Error,<br>
+ ErrMsg);<br>
+ // ParseBitcodeFile does not take ownership of the Buffer in the<br>
+ // case of an error.<br>
+ delete Buffer;<br>
+ }<br>
+ return M;<br>
+ }<br>
+<br>
+ return ParseAssembly(Buffer, 0, Err, Context);<br>
+}<br>
+<br>
+Module *llvm::getLazyIRFileModule(const std::string &Filename, SMDiagnostic &Err,<br>
+ LLVMContext &Context) {<br>
+ OwningPtr<MemoryBuffer> File;<br>
+ if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), File)) {<br>
+ Err = SMDiagnostic(Filename, SourceMgr::DK_Error,<br>
+ "Could not open input file: " + ec.message());<br>
+ return 0;<br>
+ }<br>
+<br>
+ return getLazyIRModule(File.take(), Err, Context);<br>
+}<br>
+<br>
+Module *llvm::ParseIR(MemoryBuffer *Buffer, SMDiagnostic &Err,<br>
+ LLVMContext &Context) {<br>
+ if (isBitcode((const unsigned char *)Buffer->getBufferStart(),<br>
+ (const unsigned char *)Buffer->getBufferEnd())) {<br>
+ std::string ErrMsg;<br>
+ Module *M = ParseBitcodeFile(Buffer, Context, &ErrMsg);<br>
+ if (M == 0)<br>
+ Err = SMDiagnostic(Buffer->getBufferIdentifier(), SourceMgr::DK_Error,<br>
+ ErrMsg);<br>
+ // ParseBitcodeFile does not take ownership of the Buffer.<br>
+ delete Buffer;<br>
+ return M;<br>
+ }<br>
+<br>
+ return ParseAssembly(Buffer, 0, Err, Context);<br>
+}<br>
+<br>
+Module *llvm::ParseIRFile(const std::string &Filename, SMDiagnostic &Err,<br>
+ LLVMContext &Context) {<br>
+ OwningPtr<MemoryBuffer> File;<br>
+ if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), File)) {<br>
+ Err = SMDiagnostic(Filename, SourceMgr::DK_Error,<br>
+ "Could not open input file: " + ec.message());<br>
+ return 0;<br>
+ }<br>
+<br>
+ return ParseIR(File.take(), Err, Context);<br>
+}<br>
<br>
Copied: llvm/trunk/lib/IRReader/LLVMBuild.txt (from r177968, llvm/trunk/tools/llvm-extract/LLVMBuild.txt)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IRReader/LLVMBuild.txt?p2=llvm/trunk/lib/IRReader/LLVMBuild.txt&p1=llvm/trunk/tools/llvm-extract/LLVMBuild.txt&r1=177968&r2=177971&rev=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IRReader/LLVMBuild.txt?p2=llvm/trunk/lib/IRReader/LLVMBuild.txt&p1=llvm/trunk/tools/llvm-extract/LLVMBuild.txt&r1=177968&r2=177971&rev=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-extract/LLVMBuild.txt (original)<br>
+++ llvm/trunk/lib/IRReader/LLVMBuild.txt Mon Mar 25 21:25:37 2013<br>
@@ -1,4 +1,4 @@<br>
-;===- ./tools/llvm-extract/LLVMBuild.txt -----------------------*- Conf -*--===;<br>
+;===- ./lib/AsmParser/LLVMBuild.txt ----------------------------*- Conf -*--===;<br>
;<br>
; The LLVM Compiler Infrastructure<br>
;<br>
@@ -16,7 +16,7 @@<br>
;===------------------------------------------------------------------------===;<br>
<br>
[component_0]<br>
-type = Tool<br>
-name = llvm-extract<br>
-parent = Tools<br>
-required_libraries = AsmParser BitReader BitWriter IPO<br>
+type = Library<br>
+name = IRReader<br>
+parent = Libraries<br>
+required_libraries = AsmParser BitReader Core Support<br>
<br>
Copied: llvm/trunk/lib/IRReader/Makefile (from r177968, llvm/trunk/lib/Makefile)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IRReader/Makefile?p2=llvm/trunk/lib/IRReader/Makefile&p1=llvm/trunk/lib/Makefile&r1=177968&r2=177971&rev=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IRReader/Makefile?p2=llvm/trunk/lib/IRReader/Makefile&p1=llvm/trunk/lib/Makefile&r1=177968&r2=177971&rev=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Makefile (original)<br>
+++ llvm/trunk/lib/IRReader/Makefile Mon Mar 25 21:25:37 2013<br>
@@ -1,4 +1,4 @@<br>
-##===- lib/Makefile ----------------------------------------*- Makefile -*-===##<br>
+##===- lib/IRReader/Makefile -------------------------------*- Makefile -*-===##<br>
#<br>
# The LLVM Compiler Infrastructure<br>
#<br>
@@ -6,12 +6,9 @@<br>
# License. See LICENSE.TXT for details.<br>
#<br>
##===----------------------------------------------------------------------===##<br>
-LEVEL = ..<br>
<br>
-include $(LEVEL)/Makefile.config<br>
-<br>
-PARALLEL_DIRS := IR AsmParser Bitcode Archive Analysis Transforms CodeGen \<br>
- Target ExecutionEngine Linker MC Object Option DebugInfo<br>
+LEVEL = ../..<br>
+LIBRARYNAME := LLVMIRReader<br>
+BUILD_ARCHIVE = 1<br>
<br>
include $(LEVEL)/Makefile.common<br>
-<br>
<br>
Modified: llvm/trunk/lib/LLVMBuild.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/LLVMBuild.txt?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/LLVMBuild.txt?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/LLVMBuild.txt (original)<br>
+++ llvm/trunk/lib/LLVMBuild.txt Mon Mar 25 21:25:37 2013<br>
@@ -16,7 +16,7 @@<br>
;===------------------------------------------------------------------------===;<br>
<br>
[common]<br>
-subdirectories = Analysis Archive AsmParser Bitcode CodeGen DebugInfo ExecutionEngine Linker IR MC Object Option Support TableGen Target Transforms<br>
+subdirectories = Analysis Archive AsmParser Bitcode CodeGen DebugInfo ExecutionEngine Linker IR IRReader MC Object Option Support TableGen Target Transforms<br>
<br>
[component_0]<br>
type = Group<br>
<br>
Modified: llvm/trunk/lib/Makefile<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Makefile?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Makefile?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Makefile (original)<br>
+++ llvm/trunk/lib/Makefile Mon Mar 25 21:25:37 2013<br>
@@ -11,7 +11,8 @@ LEVEL = ..<br>
include $(LEVEL)/Makefile.config<br>
<br>
PARALLEL_DIRS := IR AsmParser Bitcode Archive Analysis Transforms CodeGen \<br>
- Target ExecutionEngine Linker MC Object Option DebugInfo<br>
+ Target ExecutionEngine Linker MC Object Option DebugInfo \<br>
+ IRReader<br>
<br>
include $(LEVEL)/Makefile.common<br>
<br>
<br>
Modified: llvm/trunk/tools/bugpoint/BugDriver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint/BugDriver.cpp?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint/BugDriver.cpp?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/bugpoint/BugDriver.cpp (original)<br>
+++ llvm/trunk/tools/bugpoint/BugDriver.cpp Mon Mar 25 21:25:37 2013<br>
@@ -16,12 +16,12 @@<br>
#include "BugDriver.h"<br>
#include "ToolRunner.h"<br>
#include "llvm/IR/Module.h"<br>
+#include "llvm/IRReader/IRReader.h"<br>
#include "llvm/Linker.h"<br>
#include "llvm/Pass.h"<br>
#include "llvm/Support/CommandLine.h"<br>
#include "llvm/Support/FileUtilities.h"<br>
#include "llvm/Support/Host.h"<br>
-#include "llvm/Support/IRReader.h"<br>
#include "llvm/Support/SourceMgr.h"<br>
#include "llvm/Support/raw_ostream.h"<br>
#include <memory><br>
<br>
Modified: llvm/trunk/tools/bugpoint/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint/CMakeLists.txt?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint/CMakeLists.txt?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/bugpoint/CMakeLists.txt (original)<br>
+++ llvm/trunk/tools/bugpoint/CMakeLists.txt Mon Mar 25 21:25:37 2013<br>
@@ -1,5 +1,5 @@<br>
set(LLVM_LINK_COMPONENTS asmparser instrumentation scalaropts ipo<br>
- linker bitreader bitwriter vectorize objcarcopts)<br>
+ linker bitreader bitwriter irreader vectorize objcarcopts)<br>
<br>
add_llvm_tool(bugpoint<br>
BugDriver.cpp<br>
<br>
Modified: llvm/trunk/tools/bugpoint/LLVMBuild.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint/LLVMBuild.txt?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint/LLVMBuild.txt?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/bugpoint/LLVMBuild.txt (original)<br>
+++ llvm/trunk/tools/bugpoint/LLVMBuild.txt Mon Mar 25 21:25:37 2013<br>
@@ -19,4 +19,4 @@<br>
type = Tool<br>
name = bugpoint<br>
parent = Tools<br>
-required_libraries = AsmParser BitReader BitWriter IPO Instrumentation Linker Scalar ObjCARC<br>
+required_libraries = AsmParser BitReader BitWriter IRReader IPO Instrumentation Linker Scalar ObjCARC<br>
<br>
Modified: llvm/trunk/tools/llc/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llc/CMakeLists.txt?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llc/CMakeLists.txt?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llc/CMakeLists.txt (original)<br>
+++ llvm/trunk/tools/llc/CMakeLists.txt Mon Mar 25 21:25:37 2013<br>
@@ -1,4 +1,4 @@<br>
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} bitreader asmparser)<br>
+set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} bitreader asmparser irreader)<br>
<br>
add_llvm_tool(llc<br>
llc.cpp<br>
<br>
Modified: llvm/trunk/tools/llc/LLVMBuild.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llc/LLVMBuild.txt?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llc/LLVMBuild.txt?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llc/LLVMBuild.txt (original)<br>
+++ llvm/trunk/tools/llc/LLVMBuild.txt Mon Mar 25 21:25:37 2013<br>
@@ -19,4 +19,4 @@<br>
type = Tool<br>
name = llc<br>
parent = Tools<br>
-required_libraries = AsmParser BitReader all-targets<br>
+required_libraries = AsmParser BitReader IRReader all-targets<br>
<br>
Modified: llvm/trunk/tools/llc/llc.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llc/llc.cpp?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llc/llc.cpp?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llc/llc.cpp (original)<br>
+++ llvm/trunk/tools/llc/llc.cpp Mon Mar 25 21:25:37 2013<br>
@@ -21,6 +21,7 @@<br>
#include "llvm/CodeGen/LinkAllCodegenComponents.h"<br>
#include "llvm/IR/DataLayout.h"<br>
#include "llvm/IR/Module.h"<br>
+#include "llvm/IRReader/IRReader.h"<br>
#include "llvm/MC/SubtargetFeature.h"<br>
#include "llvm/Pass.h"<br>
#include "llvm/PassManager.h"<br>
@@ -28,11 +29,11 @@<br>
#include "llvm/Support/Debug.h"<br>
#include "llvm/Support/FormattedStream.h"<br>
#include "llvm/Support/Host.h"<br>
-#include "llvm/Support/IRReader.h"<br>
#include "llvm/Support/ManagedStatic.h"<br>
#include "llvm/Support/PluginLoader.h"<br>
#include "llvm/Support/PrettyStackTrace.h"<br>
#include "llvm/Support/Signals.h"<br>
+#include "llvm/Support/SourceMgr.h"<br>
#include "llvm/Support/TargetRegistry.h"<br>
#include "llvm/Support/TargetSelect.h"<br>
#include "llvm/Support/ToolOutputFile.h"<br>
<br>
Modified: llvm/trunk/tools/lli/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/CMakeLists.txt?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/CMakeLists.txt?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/lli/CMakeLists.txt (original)<br>
+++ llvm/trunk/tools/lli/CMakeLists.txt Mon Mar 25 21:25:37 2013<br>
@@ -1,5 +1,5 @@<br>
<br>
-set(LLVM_LINK_COMPONENTS mcjit jit interpreter nativecodegen bitreader asmparser selectiondag native)<br>
+set(LLVM_LINK_COMPONENTS mcjit jit interpreter nativecodegen bitreader asmparser irreader selectiondag native)<br>
<br>
if( LLVM_USE_OPROFILE )<br>
set(LLVM_LINK_COMPONENTS<br>
<br>
Modified: llvm/trunk/tools/lli/LLVMBuild.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/LLVMBuild.txt?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/LLVMBuild.txt?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/lli/LLVMBuild.txt (original)<br>
+++ llvm/trunk/tools/lli/LLVMBuild.txt Mon Mar 25 21:25:37 2013<br>
@@ -19,4 +19,4 @@<br>
type = Tool<br>
name = lli<br>
parent = Tools<br>
-required_libraries = AsmParser BitReader Interpreter JIT MCJIT NativeCodeGen SelectionDAG Native<br>
+required_libraries = AsmParser BitReader IRReader Interpreter JIT MCJIT NativeCodeGen SelectionDAG Native<br>
<br>
Modified: llvm/trunk/tools/lli/lli.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/lli.cpp?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/lli.cpp?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/lli/lli.cpp (original)<br>
+++ llvm/trunk/tools/lli/lli.cpp Mon Mar 25 21:25:37 2013<br>
@@ -29,11 +29,11 @@<br>
#include "llvm/ExecutionEngine/SectionMemoryManager.h"<br>
#include "llvm/IR/Module.h"<br>
#include "llvm/IR/Type.h"<br>
+#include "llvm/IRReader/IRReader.h"<br>
#include "llvm/Support/CommandLine.h"<br>
#include "llvm/Support/Debug.h"<br>
#include "llvm/Support/DynamicLibrary.h"<br>
#include "llvm/Support/Format.h"<br>
-#include "llvm/Support/IRReader.h"<br>
#include "llvm/Support/ManagedStatic.h"<br>
#include "llvm/Support/MathExtras.h"<br>
#include "llvm/Support/Memory.h"<br>
@@ -42,6 +42,7 @@<br>
#include "llvm/Support/PrettyStackTrace.h"<br>
#include "llvm/Support/Process.h"<br>
#include "llvm/Support/Signals.h"<br>
+#include "llvm/Support/SourceMgr.h"<br>
#include "llvm/Support/TargetSelect.h"<br>
#include "llvm/Support/raw_ostream.h"<br>
#include <cerrno><br>
<br>
Modified: llvm/trunk/tools/llvm-diff/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-diff/CMakeLists.txt?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-diff/CMakeLists.txt?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-diff/CMakeLists.txt (original)<br>
+++ llvm/trunk/tools/llvm-diff/CMakeLists.txt Mon Mar 25 21:25:37 2013<br>
@@ -1,4 +1,4 @@<br>
-set(LLVM_LINK_COMPONENTS support asmparser bitreader)<br>
+set(LLVM_LINK_COMPONENTS support asmparser bitreader irreader)<br>
<br>
add_llvm_tool(llvm-diff<br>
llvm-diff.cpp<br>
<br>
Modified: llvm/trunk/tools/llvm-diff/LLVMBuild.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-diff/LLVMBuild.txt?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-diff/LLVMBuild.txt?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-diff/LLVMBuild.txt (original)<br>
+++ llvm/trunk/tools/llvm-diff/LLVMBuild.txt Mon Mar 25 21:25:37 2013<br>
@@ -19,4 +19,4 @@<br>
type = Tool<br>
name = llvm-diff<br>
parent = Tools<br>
-required_libraries = AsmParser BitReader<br>
+required_libraries = AsmParser BitReader IRReader<br>
<br>
Modified: llvm/trunk/tools/llvm-diff/llvm-diff.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-diff/llvm-diff.cpp?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-diff/llvm-diff.cpp?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-diff/llvm-diff.cpp (original)<br>
+++ llvm/trunk/tools/llvm-diff/llvm-diff.cpp Mon Mar 25 21:25:37 2013<br>
@@ -19,8 +19,8 @@<br>
#include "llvm/IR/LLVMContext.h"<br>
#include "llvm/IR/Module.h"<br>
#include "llvm/IR/Type.h"<br>
+#include "llvm/IRReader/IRReader.h"<br>
#include "llvm/Support/CommandLine.h"<br>
-#include "llvm/Support/IRReader.h"<br>
#include "llvm/Support/MemoryBuffer.h"<br>
#include "llvm/Support/SourceMgr.h"<br>
#include "llvm/Support/raw_ostream.h"<br>
<br>
Modified: llvm/trunk/tools/llvm-extract/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-extract/CMakeLists.txt?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-extract/CMakeLists.txt?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-extract/CMakeLists.txt (original)<br>
+++ llvm/trunk/tools/llvm-extract/CMakeLists.txt Mon Mar 25 21:25:37 2013<br>
@@ -1,4 +1,4 @@<br>
-set(LLVM_LINK_COMPONENTS asmparser ipo bitreader bitwriter)<br>
+set(LLVM_LINK_COMPONENTS asmparser ipo bitreader bitwriter irreader)<br>
<br>
add_llvm_tool(llvm-extract<br>
llvm-extract.cpp<br>
<br>
Modified: llvm/trunk/tools/llvm-extract/LLVMBuild.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-extract/LLVMBuild.txt?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-extract/LLVMBuild.txt?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-extract/LLVMBuild.txt (original)<br>
+++ llvm/trunk/tools/llvm-extract/LLVMBuild.txt Mon Mar 25 21:25:37 2013<br>
@@ -19,4 +19,4 @@<br>
type = Tool<br>
name = llvm-extract<br>
parent = Tools<br>
-required_libraries = AsmParser BitReader BitWriter IPO<br>
+required_libraries = AsmParser BitReader BitWriter IRReader IPO<br>
<br>
Modified: llvm/trunk/tools/llvm-extract/llvm-extract.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-extract/llvm-extract.cpp?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-extract/llvm-extract.cpp?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-extract/llvm-extract.cpp (original)<br>
+++ llvm/trunk/tools/llvm-extract/llvm-extract.cpp Mon Mar 25 21:25:37 2013<br>
@@ -19,13 +19,14 @@<br>
#include "llvm/Bitcode/ReaderWriter.h"<br>
#include "llvm/IR/DataLayout.h"<br>
#include "llvm/IR/Module.h"<br>
+#include "llvm/IRReader/IRReader.h"<br>
#include "llvm/PassManager.h"<br>
#include "llvm/Support/CommandLine.h"<br>
-#include "llvm/Support/IRReader.h"<br>
#include "llvm/Support/ManagedStatic.h"<br>
#include "llvm/Support/PrettyStackTrace.h"<br>
#include "llvm/Support/Regex.h"<br>
#include "llvm/Support/Signals.h"<br>
+#include "llvm/Support/SourceMgr.h"<br>
#include "llvm/Support/SystemUtils.h"<br>
#include "llvm/Support/ToolOutputFile.h"<br>
#include "llvm/Transforms/IPO.h"<br>
<br>
Modified: llvm/trunk/tools/llvm-jitlistener/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-jitlistener/CMakeLists.txt?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-jitlistener/CMakeLists.txt?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-jitlistener/CMakeLists.txt (original)<br>
+++ llvm/trunk/tools/llvm-jitlistener/CMakeLists.txt Mon Mar 25 21:25:37 2013<br>
@@ -9,6 +9,7 @@ set(LLVM_LINK_COMPONENTS<br>
debuginfo<br>
inteljitevents<br>
interpreter<br>
+ irreader<br>
jit<br>
mcjit<br>
nativecodegen<br>
<br>
Modified: llvm/trunk/tools/llvm-jitlistener/LLVMBuild.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-jitlistener/LLVMBuild.txt?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-jitlistener/LLVMBuild.txt?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-jitlistener/LLVMBuild.txt (original)<br>
+++ llvm/trunk/tools/llvm-jitlistener/LLVMBuild.txt Mon Mar 25 21:25:37 2013<br>
@@ -19,4 +19,4 @@<br>
type = Tool<br>
name = llvm-jitlistener<br>
parent = Tools<br>
-required_libraries = AsmParser BitReader Interpreter JIT MCJIT NativeCodeGen Object SelectionDAG Native<br>
+required_libraries = AsmParser BitReader IRReader Interpreter JIT MCJIT NativeCodeGen Object SelectionDAG Native<br>
<br>
Modified: llvm/trunk/tools/llvm-jitlistener/llvm-jitlistener.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-jitlistener/llvm-jitlistener.cpp?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-jitlistener/llvm-jitlistener.cpp?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-jitlistener/llvm-jitlistener.cpp (original)<br>
+++ llvm/trunk/tools/llvm-jitlistener/llvm-jitlistener.cpp Mon Mar 25 21:25:37 2013<br>
@@ -22,9 +22,9 @@<br>
#include "llvm/ExecutionEngine/MCJIT.h"<br>
#include "llvm/ExecutionEngine/ObjectImage.h"<br>
#include "llvm/IR/Module.h"<br>
+#include "llvm/IRReader/IRReader.h"<br>
#include "llvm/Support/CommandLine.h"<br>
#include "llvm/Support/Host.h"<br>
-#include "llvm/Support/IRReader.h"<br>
#include "llvm/Support/ManagedStatic.h"<br>
#include "llvm/Support/MemoryBuffer.h"<br>
#include "llvm/Support/PrettyStackTrace.h"<br>
<br>
Modified: llvm/trunk/tools/llvm-link/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-link/CMakeLists.txt?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-link/CMakeLists.txt?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-link/CMakeLists.txt (original)<br>
+++ llvm/trunk/tools/llvm-link/CMakeLists.txt Mon Mar 25 21:25:37 2013<br>
@@ -1,4 +1,4 @@<br>
-set(LLVM_LINK_COMPONENTS linker bitreader bitwriter asmparser)<br>
+set(LLVM_LINK_COMPONENTS linker bitreader bitwriter asmparser irreader)<br>
<br>
add_llvm_tool(llvm-link<br>
llvm-link.cpp<br>
<br>
Modified: llvm/trunk/tools/llvm-link/LLVMBuild.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-link/LLVMBuild.txt?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-link/LLVMBuild.txt?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-link/LLVMBuild.txt (original)<br>
+++ llvm/trunk/tools/llvm-link/LLVMBuild.txt Mon Mar 25 21:25:37 2013<br>
@@ -19,4 +19,4 @@<br>
type = Tool<br>
name = llvm-link<br>
parent = Tools<br>
-required_libraries = AsmParser BitReader BitWriter Linker<br>
+required_libraries = AsmParser BitReader BitWriter IRReader Linker<br>
<br>
Modified: llvm/trunk/tools/llvm-link/llvm-link.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-link/llvm-link.cpp?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-link/llvm-link.cpp?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-link/llvm-link.cpp (original)<br>
+++ llvm/trunk/tools/llvm-link/llvm-link.cpp Mon Mar 25 21:25:37 2013<br>
@@ -17,12 +17,13 @@<br>
#include "llvm/Bitcode/ReaderWriter.h"<br>
#include "llvm/IR/LLVMContext.h"<br>
#include "llvm/IR/Module.h"<br>
+#include "llvm/IRReader/IRReader.h"<br>
#include "llvm/Support/CommandLine.h"<br>
-#include "llvm/Support/IRReader.h"<br>
#include "llvm/Support/ManagedStatic.h"<br>
#include "llvm/Support/Path.h"<br>
#include "llvm/Support/PrettyStackTrace.h"<br>
#include "llvm/Support/Signals.h"<br>
+#include "llvm/Support/SourceMgr.h"<br>
#include "llvm/Support/SystemUtils.h"<br>
#include "llvm/Support/ToolOutputFile.h"<br>
#include <memory><br>
<br>
Modified: llvm/trunk/tools/opt/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/CMakeLists.txt?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/CMakeLists.txt?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/opt/CMakeLists.txt (original)<br>
+++ llvm/trunk/tools/opt/CMakeLists.txt Mon Mar 25 21:25:37 2013<br>
@@ -1,4 +1,4 @@<br>
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} bitreader asmparser bitwriter instrumentation scalaropts objcarcopts ipo vectorize)<br>
+set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} bitreader asmparser bitwriter irreader instrumentation scalaropts objcarcopts ipo vectorize)<br>
<br>
add_llvm_tool(opt<br>
AnalysisWrappers.cpp<br>
<br>
Modified: llvm/trunk/tools/opt/LLVMBuild.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/LLVMBuild.txt?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/LLVMBuild.txt?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/opt/LLVMBuild.txt (original)<br>
+++ llvm/trunk/tools/opt/LLVMBuild.txt Mon Mar 25 21:25:37 2013<br>
@@ -19,4 +19,4 @@<br>
type = Tool<br>
name = opt<br>
parent = Tools<br>
-required_libraries = AsmParser BitReader BitWriter IPO Instrumentation Scalar ObjCARC all-targets<br>
+required_libraries = AsmParser BitReader BitWriter IRReader IPO Instrumentation Scalar ObjCARC all-targets<br>
<br>
Modified: llvm/trunk/tools/opt/opt.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/opt.cpp?rev=177971&r1=177970&r2=177971&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/opt.cpp?rev=177971&r1=177970&r2=177971&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/opt/opt.cpp (original)<br>
+++ llvm/trunk/tools/opt/opt.cpp Mon Mar 25 21:25:37 2013<br>
@@ -26,17 +26,18 @@<br>
#include "llvm/DebugInfo.h"<br>
#include "llvm/IR/DataLayout.h"<br>
#include "llvm/IR/Module.h"<br>
+#include "llvm/IRReader/IRReader.h"<br>
#include "llvm/LinkAllIR.h"<br>
#include "llvm/LinkAllPasses.h"<br>
#include "llvm/MC/SubtargetFeature.h"<br>
#include "llvm/PassManager.h"<br>
#include "llvm/Support/Debug.h"<br>
-#include "llvm/Support/IRReader.h"<br>
#include "llvm/Support/ManagedStatic.h"<br>
#include "llvm/Support/PassNameParser.h"<br>
#include "llvm/Support/PluginLoader.h"<br>
#include "llvm/Support/PrettyStackTrace.h"<br>
#include "llvm/Support/Signals.h"<br>
+#include "llvm/Support/SourceMgr.h"<br>
#include "llvm/Support/SystemUtils.h"<br>
#include "llvm/Support/TargetRegistry.h"<br>
#include "llvm/Support/TargetSelect.h"<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>