diff options
| author | Graydon Hoare <[email protected]> | 2010-07-27 17:23:41 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2010-07-27 17:23:41 -0700 |
| commit | 6662aeb779d3e44886c466378578ebe1979de15a (patch) | |
| tree | bf960612925fe9b166691c84fd85a9209307c5d0 | |
| parent | Distill semantics of use-def maps to fewer and more-obvious words. (diff) | |
| download | rust-6662aeb779d3e44886c466378578ebe1979de15a.tar.xz rust-6662aeb779d3e44886c466378578ebe1979de15a.zip | |
Calm some LLVM indigestion of last change.
| -rw-r--r-- | src/Makefile | 1 | ||||
| -rw-r--r-- | src/boot/llvm/lltrans.ml | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/Makefile b/src/Makefile index 8e88f005..e9c9a5bb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -451,6 +451,7 @@ TEST_XFAILS_LLVM := $(addprefix test/run-pass/, \ rec.rs \ simple-obj.rs \ spawn-fn.rs \ + spawn-module-qualified.rs \ spawn.rs \ stateful-obj.rs \ str-append.rs \ diff --git a/src/boot/llvm/lltrans.ml b/src/boot/llvm/lltrans.ml index b9aab377..e191ce01 100644 --- a/src/boot/llvm/lltrans.ml +++ b/src/boot/llvm/lltrans.ml @@ -764,16 +764,16 @@ let trans_crate match lval with Ast.LVAL_base { id = base_id } -> set_debug_loc base_id; - let referent = lval_to_referent sem_cx base_id in + let defn_id = lval_base_defn_id sem_cx lval in begin - match resolve_lval_id sem_cx base_id with + match get_defn sem_cx defn_id with Semant.DEFN_slot slot -> - (Hashtbl.find slot_to_llvalue referent, slot_ty slot) + (Hashtbl.find slot_to_llvalue defn_id, slot_ty slot) | Semant.DEFN_item _ -> - (Hashtbl.find llitems referent, lval_ty sem_cx lval) + (Hashtbl.find llitems defn_id, lval_ty sem_cx lval) | _ -> - Common.unimpl (Some referent) - "LLVM base-referent translation of: %a" + Common.unimpl (Some defn_id) + "LLVM base-defn translation of: %a" Ast.sprintf_lval lval end | Ast.LVAL_ext (base, component) -> |