diff options
| author | bors <bors@rust-lang.org> | 2018-01-16 08:06:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-01-16 08:06:15 +0000 |
| commit | da569fa9ddf8369a9809184d43c600dc06bd4b4d (patch) | |
| tree | ab2525d5f06e049c2d5092631fe781d79b9037c2 /src/rustllvm/PassWrapper.cpp | |
| parent | 79a521bb9a8ace1a6663578a4c409906adde620d (diff) | |
| parent | 4e40a0d43640a5cf26f28cea35ec16445966a000 (diff) | |
| download | rust-da569fa9ddf8369a9809184d43c600dc06bd4b4d.tar.gz rust-da569fa9ddf8369a9809184d43c600dc06bd4b4d.zip | |
Auto merge of #47209 - eddyb:ccx, r=nikomatsakis
rustc_trans: reorganize CrateContext and rename context types.
Firstly, the `{Shared,Local}CrateContext` hasn't been meaningful for a while now, and this PR resolves it by moving all their fields to `CrateContext` and removing redundant accessor methods.
Secondly, this PR contains the following mass-renames:
* `ccx: CrateContext` -> `cx: CodegenCx`
* `mircx: MirContext` -> `fx: FunctionCx`
* `bcx: Builder` -> `bx: Builder`
r? @nikomatsakis
Diffstat (limited to 'src/rustllvm/PassWrapper.cpp')
| -rw-r--r-- | src/rustllvm/PassWrapper.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp index 4e326c9e199..54a73a04bfa 100644 --- a/src/rustllvm/PassWrapper.cpp +++ b/src/rustllvm/PassWrapper.cpp @@ -746,10 +746,6 @@ LLVMRustSetDataLayoutFromTargetMachine(LLVMModuleRef Module, unwrap(Module)->setDataLayout(Target->createDataLayout()); } -extern "C" LLVMTargetDataRef LLVMRustGetModuleDataLayout(LLVMModuleRef M) { - return wrap(&unwrap(M)->getDataLayout()); -} - extern "C" void LLVMRustSetModulePIELevel(LLVMModuleRef M) { unwrap(M)->setPIELevel(PIELevel::Level::Large); } |