projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reapply pieces of 78914 reverted in 78916, this has been fixed.
[oota-llvm.git]
/
lib
/
Target
/
MSIL
/
MSILWriter.h
diff --git
a/lib/Target/MSIL/MSILWriter.h
b/lib/Target/MSIL/MSILWriter.h
index ea0dfad0e469165dc618f8f975d33a084d149eb3..aa9e07540f9e340aa8a712bcc0720b49fd9a5754 100644
(file)
--- a/
lib/Target/MSIL/MSILWriter.h
+++ b/
lib/Target/MSIL/MSILWriter.h
@@
-19,18
+19,17
@@
#include "llvm/IntrinsicInst.h"
#include "llvm/Pass.h"
#include "llvm/PassManager.h"
#include "llvm/IntrinsicInst.h"
#include "llvm/Pass.h"
#include "llvm/PassManager.h"
+#include "llvm/ADT/StringRef.h"
#include "llvm/Analysis/FindUsedTypes.h"
#include "llvm/Analysis/LoopInfo.h"
#include "llvm/Analysis/FindUsedTypes.h"
#include "llvm/Analysis/LoopInfo.h"
+#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/GetElementPtrTypeIterator.h"
#include "llvm/Support/GetElementPtrTypeIterator.h"
-#include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetData.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetData.h"
#include "llvm/Target/TargetMachine.h"
-#include "llvm/Target/TargetMachineRegistry.h"
#include "llvm/Support/Mangler.h"
#include "llvm/Support/Mangler.h"
-#include <ios>
-using namespace llvm;
-namespace {
+namespace llvm {
+ extern Target TheMSILTarget;
class MSILModule : public ModulePass {
Module *ModulePtr;
class MSILModule : public ModulePass {
Module *ModulePtr;
@@
-56,7
+55,7
@@
namespace {
};
};
- class MSILWriter
: public FunctionPass {
+ class MSILWriter : public FunctionPass {
struct StaticInitializer {
const Constant* constant;
uint64_t offset;
struct StaticInitializer {
const Constant* constant;
uint64_t offset;
@@
-75,7
+74,7
@@
namespace {
}
public:
}
public:
- raw_ostream &Out;
+
formatted_
raw_ostream &Out;
Module* ModulePtr;
const TargetData* TD;
Mangler* Mang;
Module* ModulePtr;
const TargetData* TD;
Mangler* Mang;
@@
-88,8
+87,8
@@
namespace {
DenseMap<const Value*, unsigned> AnonValueNumbers;
unsigned NextAnonValueNumber;
DenseMap<const Value*, unsigned> AnonValueNumbers;
unsigned NextAnonValueNumber;
- MSILWriter(
raw_ostream &o)
-
: FunctionPass(&ID), Out(o),
NextAnonValueNumber(0) {
+ MSILWriter(
formatted_raw_ostream &o) : FunctionPass(&ID), Out(o),
+
NextAnonValueNumber(0) {
UniqID = 0;
}
UniqID = 0;
}
@@
-248,11
+247,12
@@
namespace {
const char* getLibraryName(const GlobalVariable* GV);
const char* getLibraryName(const GlobalVariable* GV);
- const char* getLibraryForSymbol(const
char*
Name, bool isFunction,
+ const char* getLibraryForSymbol(const
StringRef &
Name, bool isFunction,
unsigned CallingConv);
void printExternals();
};
unsigned CallingConv);
void printExternals();
};
+
}
#endif
}
#endif