File tree 2 files changed +10
-9
lines changed
2 files changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -358,14 +358,14 @@ priv impl &preserve_ctxt {
358
358
debug ! ( "Elected to root" ) ;
359
359
let rk = { id: base. id , derefs: derefs} ;
360
360
// This code could potentially lead cause boxes to be frozen
361
- // for longer than necessarily at runtime. It prevents an ICE
362
- // in trans; the fundamental problem is that it's hard to make
363
- // sure trans and borrowck have the same notion of scope. The
364
- // real fix is to clean up how trans handles cleanups, but
365
- // that's hard. If this becomes an issue, it's an option to just
366
- // change this to `let scope_to_use = scope_id;`. Though that
367
- // would potentially re-introduce the ICE. See #3511 for more
368
- // details.
361
+ // for longer than necessarily at runtime. It prevents an
362
+ // ICE in trans; the fundamental problem is that it's hard
363
+ // to make sure trans and borrowck have the same notion of
364
+ // scope. The real fix is to clean up how trans handles
365
+ // cleanups, but that's hard. If this becomes an issue, it's
366
+ // an option to just change this to `let scope_to_use =
367
+ // scope_id;`. Though that would potentially re-introduce
368
+ // the ICE. See #3511 for more details.
369
369
let scope_to_use = if
370
370
self . bccx . stmt_map . contains_key ( scope_id) {
371
371
// Root it in its parent scope, b/c
Original file line number Diff line number Diff line change @@ -405,7 +405,8 @@ fn const_expr(cx: @crate_ctxt, e: @ast::expr) -> ValueRef {
405
405
assert ast_util:: is_local ( def_id) ;
406
406
let f = base:: get_item_val ( cx, def_id. node ) ;
407
407
match purity {
408
- ast:: extern_fn => llvm:: LLVMConstPointerCast ( f, T_ptr ( T_i8 ( ) ) ) ,
408
+ ast:: extern_fn =>
409
+ llvm:: LLVMConstPointerCast ( f, T_ptr ( T_i8 ( ) ) ) ,
409
410
_ => C_struct ( ~[ f, C_null ( T_opaque_box_ptr ( cx) ) ] )
410
411
}
411
412
}
You can’t perform that action at this time.
0 commit comments