debuginfo: Implemented proper handling of lexical scopes and variable shadowing.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/librustc/middle/trans/common.rs b/src/librustc/middle/trans/common.rs
index 3253e24ae88..10185a9a795 100644
--- a/src/librustc/middle/trans/common.rs
+++ b/src/librustc/middle/trans/common.rs
@@ -23,6 +23,7 @@ use middle::trans::build;
 use middle::trans::datum;
 use middle::trans::glue;
 use middle::trans::write_guard;
+use middle::trans::debuginfo;
 use middle::ty::substs;
 use middle::ty;
 use middle::typeck;
@@ -226,7 +227,12 @@ pub struct FunctionContext {
     path: path,
 
     // This function's enclosing crate context.
-    ccx: @mut CrateContext
+    ccx: @mut CrateContext,
+
+    // Used and maintained by the debuginfo module.
+    // @jdm: Not sure if the Option-wrapper is a good idea. It allows to save some space in
+    // non-debug builds, but generates quite a bit of noise at usage sites. What's your opinion?
+    debug_context: Option<~debuginfo::FunctionDebugContext>
 }
 
 impl FunctionContext {