Fix static name resolution in mixing code

runtime/vm/parser.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/parser.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/compiler_stats.h"
@@ skipping 8237 matching lines @@
       if (local->IsConst()) {
         *node = new LiteralNode(ident_pos, *local->ConstValue());
       } else {
         *node = new LoadLocalNode(ident_pos, local);
       }
     }
     return true;
   }
 
   // Try to find the identifier in the class scope of the current class.
-  Class& cls = Class::Handle(isolate, current_class().raw());
+  // If the current class is the result of a mixin application, we must
+  // use the class scope of the class from which the function originates.
+  Class& cls = Class::Handle(isolate);
+  if (current_class().mixin() == Type::null()) {
+    cls = current_class().raw();
+  } else {
+    cls = parsed_function()->function().origin();
+  }
   Function& func = Function::Handle(isolate, Function::null());
   Field& field = Field::Handle(isolate, Field::null());
 
   // First check if a field exists.
   field = cls.LookupField(ident);
   if (!field.IsNull()) {
     if (node != NULL) {
       if (!field.is_static()) {
         CheckInstanceFieldAccess(ident_pos, ident);
         *node = CallGetter(ident_pos, LoadReceiver(ident_pos), ident);
@@ skipping 1723 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart