OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

debuginfo: Fixed some merge fallout

Browse Source
This commit is contained in:
Michael Woerister 2013-09-03 12:15:56 +02:00
parent 6b2df76c24
commit e0b63b0e2a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/librustc/middle/trans/debuginfo.rs
View File

@ -124,7 +124,7 @@ pub enum FunctionDebugContext {
} }
impl FunctionDebugContext { impl FunctionDebugContext {
fn get_ref<'a>(&'a self, cx: &CrateContext, span: span) -> &'a FunctionDebugContextData { fn get_ref<'a>(&'a self, cx: &CrateContext, span: Span) -> &'a FunctionDebugContextData {
match *self { match *self {
FunctionDebugContext(~ref data) => data, FunctionDebugContext(~ref data) => data,
DebugInfoDisabled => { DebugInfoDisabled => {
@ -140,7 +140,7 @@ impl FunctionDebugContext {
fn get_mut_ref<'a>(&'a mut self, fn get_mut_ref<'a>(&'a mut self,
cx: &CrateContext, cx: &CrateContext,
span: span) span: Span)
-> &'a mut FunctionDebugContextData { -> &'a mut FunctionDebugContextData {
match *self { match *self {
FunctionDebugContext(~ref mut data) => data, FunctionDebugContext(~ref mut data) => data,
@ -229,7 +229,7 @@ pub fn create_local_var_metadata(bcx: @mut Block,
pub fn create_captured_var_metadata(bcx: @mut Block, pub fn create_captured_var_metadata(bcx: @mut Block,
node_id: ast::NodeId, node_id: ast::NodeId,
llptr: ValueRef, llptr: ValueRef,
span: span) { span: Span) {
if fn_should_be_ignored(bcx.fcx) { if fn_should_be_ignored(bcx.fcx) {
return; return;
} }
@ -270,7 +270,7 @@ pub fn create_match_binding_metadata(bcx: @mut Block,
variable_ident: ast::Ident, variable_ident: ast::Ident,
node_id: ast::NodeId, node_id: ast::NodeId,
variable_type: ty::t, variable_type: ty::t,
span: span) { span: Span) {
if fn_should_be_ignored(bcx.fcx) { if fn_should_be_ignored(bcx.fcx) {
return; return;
} }
@ -406,7 +406,7 @@ pub fn create_argument_metadata(bcx: @mut Block,
/// reliably find the correct visibility scope for the code position. /// reliably find the correct visibility scope for the code position.
pub fn set_source_location(fcx: &FunctionContext, pub fn set_source_location(fcx: &FunctionContext,
node_id: ast::NodeId, node_id: ast::NodeId,
span: span) { span: Span) {
if fn_should_be_ignored(fcx) { if fn_should_be_ignored(fcx) {
return; return;
} }
@ -784,12 +784,12 @@ fn compile_unit_metadata(cx: @mut CrateContext) {
fn declare_local(bcx: @mut Block, fn declare_local(bcx: @mut Block,
llptr: ValueRef, llptr: ValueRef,
variable_ident: ast::ident, variable_ident: ast::Ident,
variable_type: ty::t, variable_type: ty::t,
scope_metadata: DIScope, scope_metadata: DIScope,
variable_access: VariableAccess, variable_access: VariableAccess,
variable_kind: VariableKind, variable_kind: VariableKind,
span: span) { span: Span) {
let cx: &mut CrateContext = bcx.ccx(); let cx: &mut CrateContext = bcx.ccx();
let filename = span_start(cx, span).file.name; let filename = span_start(cx, span).file.name;
@ -890,7 +890,7 @@ fn file_metadata(cx: &mut CrateContext, full_path: &str) -> DIFile {
/// Finds the scope metadata node for the given AST node. /// Finds the scope metadata node for the given AST node.
fn scope_metadata(fcx: &FunctionContext, fn scope_metadata(fcx: &FunctionContext,
node_id: ast::NodeId, node_id: ast::NodeId,
span: span) span: Span)
-> DIScope { -> DIScope {
let scope_map = &fcx.debug_context.get_ref(fcx.ccx, span).scope_map; let scope_map = &fcx.debug_context.get_ref(fcx.ccx, span).scope_map;
@ -1428,7 +1428,7 @@ fn vec_slice_metadata(cx: &mut CrateContext,
fn subroutine_type_metadata(cx: &mut CrateContext, fn subroutine_type_metadata(cx: &mut CrateContext,
signature: &ty::FnSig, signature: &ty::FnSig,
span: span) span: Span)
-> DICompositeType { -> DICompositeType {
let loc = span_start(cx, span); let loc = span_start(cx, span);
let file_metadata = file_metadata(cx, loc.file.name); let file_metadata = file_metadata(cx, loc.file.name);