From 983cc777c5090df18188dd417cdfda8acfc2cb1b Mon Sep 17 00:00:00 2001 From: Michael Woerister Date: Wed, 7 Aug 2013 00:14:08 +0200 Subject: [PATCH] debuginfo: Add some tests for visibiliy scopes within closures. --- src/librustc/middle/trans/debuginfo.rs | 4 +- .../lexical-scope-in-managed-closure.rs | 79 +++++++++++++++++++ .../lexical-scope-in-stack-closure.rs | 79 +++++++++++++++++++ .../lexical-scope-in-unique-closure.rs | 79 +++++++++++++++++++ 4 files changed, 239 insertions(+), 2 deletions(-) create mode 100644 src/test/debug-info/lexical-scope-in-managed-closure.rs create mode 100644 src/test/debug-info/lexical-scope-in-stack-closure.rs create mode 100644 src/test/debug-info/lexical-scope-in-unique-closure.rs diff --git a/src/librustc/middle/trans/debuginfo.rs b/src/librustc/middle/trans/debuginfo.rs index 5591f7debf8..66ff2495c29 100644 --- a/src/librustc/middle/trans/debuginfo.rs +++ b/src/librustc/middle/trans/debuginfo.rs @@ -128,7 +128,7 @@ pub struct FunctionDebugContext { } impl FunctionDebugContext { - priv fn new() -> FunctionDebugContext { + fn new() -> FunctionDebugContext { return FunctionDebugContext { scope_map: HashMap::new(), argument_counter: 1, @@ -449,7 +449,7 @@ fn declare_local(bcx: @mut Block, let type_metadata = type_metadata(cx, variable_type, span); let scope = scope_metadata(bcx.fcx, node_id, span); - let var_metadata = do name.as_c_str |name| { + let var_metadata = do name.to_c_str().with_ref |name| { unsafe { llvm::LLVMDIBuilderCreateLocalVariable( DIB(cx), diff --git a/src/test/debug-info/lexical-scope-in-managed-closure.rs b/src/test/debug-info/lexical-scope-in-managed-closure.rs new file mode 100644 index 00000000000..d04818b56cd --- /dev/null +++ b/src/test/debug-info/lexical-scope-in-managed-closure.rs @@ -0,0 +1,79 @@ +// Copyright 2013 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// xfail-win32 Broken because of LLVM bug: http://llvm.org/bugs/show_bug.cgi?id=16249 + +// compile-flags:-Z extra-debug-info +// debugger:break zzz +// debugger:run + +// debugger:finish +// debugger:print x +// check:$1 = false +// debugger:continue + +// debugger:finish +// debugger:print x +// check:$2 = false +// debugger:continue + +// debugger:finish +// debugger:print x +// check:$3 = 1000 +// debugger:continue + +// debugger:finish +// debugger:print x +// check:$4 = 2.5 +// debugger:continue + +// debugger:finish +// debugger:print x +// check:$5 = true +// debugger:continue + +// debugger:finish +// debugger:print x +// check:$6 = false +// debugger:continue + +fn main() { + + let x = false; + + zzz(); + sentinel(); + + let managed_closure: @fn(int) = |x| { + zzz(); + sentinel(); + + let x = 2.5; + + zzz(); + sentinel(); + + let x = true; + + zzz(); + sentinel(); + }; + + zzz(); + sentinel(); + + managed_closure(1000); + + zzz(); + sentinel(); +} + +fn zzz() {()} +fn sentinel() {()} diff --git a/src/test/debug-info/lexical-scope-in-stack-closure.rs b/src/test/debug-info/lexical-scope-in-stack-closure.rs new file mode 100644 index 00000000000..dd86b4a8673 --- /dev/null +++ b/src/test/debug-info/lexical-scope-in-stack-closure.rs @@ -0,0 +1,79 @@ +// Copyright 2013 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// xfail-win32 Broken because of LLVM bug: http://llvm.org/bugs/show_bug.cgi?id=16249 + +// compile-flags:-Z extra-debug-info +// debugger:break zzz +// debugger:run + +// debugger:finish +// debugger:print x +// check:$1 = false +// debugger:continue + +// debugger:finish +// debugger:print x +// check:$2 = false +// debugger:continue + +// debugger:finish +// debugger:print x +// check:$3 = 1000 +// debugger:continue + +// debugger:finish +// debugger:print x +// check:$4 = 2.5 +// debugger:continue + +// debugger:finish +// debugger:print x +// check:$5 = true +// debugger:continue + +// debugger:finish +// debugger:print x +// check:$6 = false +// debugger:continue + +fn main() { + + let x = false; + + zzz(); + sentinel(); + + let stack_closure: &fn(int) = |x| { + zzz(); + sentinel(); + + let x = 2.5; + + zzz(); + sentinel(); + + let x = true; + + zzz(); + sentinel(); + }; + + zzz(); + sentinel(); + + stack_closure(1000); + + zzz(); + sentinel(); +} + +fn zzz() {()} +fn sentinel() {()} diff --git a/src/test/debug-info/lexical-scope-in-unique-closure.rs b/src/test/debug-info/lexical-scope-in-unique-closure.rs new file mode 100644 index 00000000000..32251f4a8c2 --- /dev/null +++ b/src/test/debug-info/lexical-scope-in-unique-closure.rs @@ -0,0 +1,79 @@ +// Copyright 2013 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// xfail-win32 Broken because of LLVM bug: http://llvm.org/bugs/show_bug.cgi?id=16249 + +// compile-flags:-Z extra-debug-info +// debugger:break zzz +// debugger:run + +// debugger:finish +// debugger:print x +// check:$1 = false +// debugger:continue + +// debugger:finish +// debugger:print x +// check:$2 = false +// debugger:continue + +// debugger:finish +// debugger:print x +// check:$3 = 1000 +// debugger:continue + +// debugger:finish +// debugger:print x +// check:$4 = 2.5 +// debugger:continue + +// debugger:finish +// debugger:print x +// check:$5 = true +// debugger:continue + +// debugger:finish +// debugger:print x +// check:$6 = false +// debugger:continue + +fn main() { + + let x = false; + + zzz(); + sentinel(); + + let unique_closure: ~fn(int) = |x| { + zzz(); + sentinel(); + + let x = 2.5; + + zzz(); + sentinel(); + + let x = true; + + zzz(); + sentinel(); + }; + + zzz(); + sentinel(); + + unique_closure(1000); + + zzz(); + sentinel(); +} + +fn zzz() {()} +fn sentinel() {()}