---

yaml
---
r: 147609
b: refs/heads/try2
c: 558099b
h: refs/heads/master
i:
  147607: a22a1e5
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 13e1bf1881f2523edd315a73412f74339a2168db
+refs/heads/try2: 558099b5093b9094d13b99e5bec4e71a8f02e01f
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/trans/debuginfo.rs

@@ -222,21 +222,6 @@ impl FunctionDebugContext {
         }
     }
 
-    fn get_mut_ref<'a>(&'a mut self,
-                       cx: &CrateContext,
-                       span: Span)
-                    -> &'a mut FunctionDebugContextData {
-        match *self {
-            FunctionDebugContext(~ref mut data) => data,
-            DebugInfoDisabled => {
-                cx.sess.span_bug(span, FunctionDebugContext::debuginfo_disabled_message());
-            }
-            FunctionWithoutDebugInfo => {
-                cx.sess.span_bug(span, FunctionDebugContext::should_be_ignored_message());
-            }
-        }
-    }
-
     fn debuginfo_disabled_message() -> &'static str {
         "debuginfo: Error trying to access FunctionDebugContext although debug info is disabled!"
     }
@@ -459,7 +444,7 @@ pub fn create_self_argument_metadata(bcx: @Block,
     let scope_metadata = bcx.fcx.debug_context.get_ref(bcx.ccx(), span).fn_metadata;
 
     let argument_index = {
-        let counter = &mut bcx.fcx.debug_context.get_mut_ref(bcx.ccx(), span).argument_counter;
+        let counter = &bcx.fcx.debug_context.get_ref(bcx.ccx(), span).argument_counter;
         let argument_index = counter.get();
         counter.set(argument_index + 1);
         argument_index
@@ -538,7 +523,7 @@ pub fn create_argument_metadata(bcx: @Block,
         let argument_ident = ast_util::path_to_ident(path_ref);
 
         let argument_index = {
-            let counter = &fcx.debug_context.get_mut_ref(cx, span).argument_counter;
+            let counter = &fcx.debug_context.get_ref(cx, span).argument_counter;
             let argument_index = counter.get();
             counter.set(argument_index + 1);
             argument_index
@@ -596,9 +581,9 @@ pub fn clear_source_location(fcx: &FunctionContext) {
 /// when beginning to translate a new function. This functions switches source location emitting on
 /// and must therefore be called before the first real statement/expression of the function is
 /// translated.
-pub fn start_emitting_source_locations(fcx: &mut FunctionContext) {
+pub fn start_emitting_source_locations(fcx: &FunctionContext) {
     match fcx.debug_context {
-        FunctionDebugContext(~ref mut data) => {
+        FunctionDebugContext(~ref data) => {
             data.source_locations_enabled.set(true)
         },
         _ => { /* safe to ignore */ }