Actually encode syntax context info for spans.

Author: ibabushkin

src/librustc_metadata/decoder.rs

@@ -45,8 +45,7 @@ use syntax::ast::{self, Ident};
 use syntax::codemap;
 use syntax::symbol::{InternedString, Symbol};
 use syntax::ext::base::MacroKind;
-use syntax_pos::{self, Span, SyntaxContext, BytePos, Pos, DUMMY_SP};
-use syntax_pos::hygiene;
+use syntax_pos::{self, hygiene, Span, SyntaxContext, BytePos, Pos, DUMMY_SP};
 
 pub struct DecodeContext<'a, 'tcx: 'a> {
     opaque: opaque::Decoder<'a>,
@@ -241,7 +240,7 @@ impl<'a, 'tcx> SpecializedDecoder<CrateNum> for DecodeContext<'a, 'tcx> {
 impl<'a, 'tcx> SpecializedDecoder<hygiene::Mark> for DecodeContext<'a, 'tcx> {
     fn specialized_decode(&mut self) -> Result<hygiene::Mark, Self::Error> {
         let mark = u32::decode(self)?;
-        //
+
         // We only perform translation if hygiene info is already available and if the
         // mark actually needs translation. That way we avoid loops (as obtaining hygiene
         // info for an external crate involves decoding marks) and avoid incorrectly translated

src/libsyntax_pos/lib.rs

@@ -316,13 +316,17 @@ impl Default for Span {
 
 impl serialize::UseSpecializedEncodable for Span {
     fn default_encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
-        s.emit_struct("Span", 2, |s| {
+        s.emit_struct("Span", 3, |s| {
             s.emit_struct_field("lo", 0, |s| {
                 self.lo().encode(s)
             })?;
 
             s.emit_struct_field("hi", 1, |s| {
                 self.hi().encode(s)
+            })?;
+
+            s.emit_struct_field("ctxt", 2, |s| {
+                self.ctxt().encode(s)
             })
         })
     }