Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: pkg/kernel/lib/binary/ast_from_binary.dart

Issue 2669303002: Support for modular mixin resolution. (Closed)
Patch Set: Fix a bug Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/kernel/lib/ast.dart ('k') | pkg/kernel/lib/binary/ast_to_binary.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/kernel/lib/binary/ast_from_binary.dart
diff --git a/pkg/kernel/lib/binary/ast_from_binary.dart b/pkg/kernel/lib/binary/ast_from_binary.dart
index 8c940f69fe5586c80a9aab09cc9354c5f8db56a9..0ca2f6074d92f10566fe8414692cb8963e6e9cdc 100644
--- a/pkg/kernel/lib/binary/ast_from_binary.dart
+++ b/pkg/kernel/lib/binary/ast_from_binary.dart
@@ -324,9 +324,8 @@ class BinaryBuilder {
node.fileOffset = readOffset();
int flags = readByte();
node.isAbstract = flags & 0x1 != 0;
- node.level = _currentLibrary.isExternal
- ? (flags & 0x2 != 0) ? ClassLevel.Type : ClassLevel.Hierarchy
- : ClassLevel.Body;
+ int levelIndex = (flags >> 1) & 0x3;
+ node.level = ClassLevel.values[levelIndex + 1];
node.name = readStringOrNullIfEmpty();
node.fileUri = readUriReference();
node.annotations = readAnnotationList(node);
@@ -351,9 +350,8 @@ class BinaryBuilder {
node.fileOffset = readOffset();
int flags = readByte();
node.isAbstract = flags & 0x1 != 0;
- node.level = _currentLibrary.isExternal
- ? (flags & 0x2 != 0) ? ClassLevel.Type : ClassLevel.Hierarchy
- : ClassLevel.Body;
+ int levelIndex = (flags >> 1) & 0x3;
+ node.level = ClassLevel.values[levelIndex];
node.name = readStringOrNullIfEmpty();
node.fileUri = readUriReference();
node.annotations = readAnnotationList(node);
« no previous file with comments | « pkg/kernel/lib/ast.dart ('k') | pkg/kernel/lib/binary/ast_to_binary.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698