diff options
| author | Logan Chien <loganchien@google.com> | 2011-07-20 14:35:08 +0800 |
|---|---|---|
| committer | Logan Chien <loganchien@google.com> | 2011-07-20 14:37:02 +0800 |
| commit | ebf5f0962932032481ae306b42c96c68c3a0be95 (patch) | |
| tree | bbb4590c963c577450081053136a90c5bd05c74e /include/llvm/GlobalVariable.h | |
| parent | 46b77918fb8670fbc0a4a6389c5fa0795264c2cb (diff) | |
| parent | e76a33b9567d78a5744dc52fcec3a6056d6fb576 (diff) | |
| download | external_llvm-ebf5f0962932032481ae306b42c96c68c3a0be95.zip external_llvm-ebf5f0962932032481ae306b42c96c68c3a0be95.tar.gz external_llvm-ebf5f0962932032481ae306b42c96c68c3a0be95.tar.bz2 | |
Merge with LLVM upstream r135568 (Jul 20th 2011)
Conflicts:
lib/Bitcode/Reader/BitcodeReader.cpp
Change-Id: Iebed76d2f7d281e742947e31d9a0b78174daf2d6
Diffstat (limited to 'include/llvm/GlobalVariable.h')
| -rw-r--r-- | include/llvm/GlobalVariable.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/llvm/GlobalVariable.h b/include/llvm/GlobalVariable.h index bbc09c1..034ade1 100644 --- a/include/llvm/GlobalVariable.h +++ b/include/llvm/GlobalVariable.h @@ -50,12 +50,12 @@ public: } /// GlobalVariable ctor - If a parent module is specified, the global is /// automatically inserted into the end of the specified modules global list. - GlobalVariable(const Type *Ty, bool isConstant, LinkageTypes Linkage, + GlobalVariable(Type *Ty, bool isConstant, LinkageTypes Linkage, Constant *Initializer = 0, const Twine &Name = "", bool ThreadLocal = false, unsigned AddressSpace = 0); /// GlobalVariable ctor - This creates a global and inserts it before the /// specified other global. - GlobalVariable(Module &M, const Type *Ty, bool isConstant, + GlobalVariable(Module &M, Type *Ty, bool isConstant, LinkageTypes Linkage, Constant *Initializer, const Twine &Name, GlobalVariable *InsertBefore = 0, bool ThreadLocal = false, |