fix #549 export of properties

R=vsm@google.com Review URL: https://codereview.chromium.org/1949253002 .
dart-lang · May 4, 2016 · 56b9d09 · 56b9d09
1 parent c840252
commit 56b9d09
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/pkg/dev_compiler/lib/src/compiler/code_generator.dart b/pkg/dev_compiler/lib/src/compiler/code_generator.dart
@@ -416,7 +416,12 @@ class CodeGenerator extends GeneralizingAstVisitor
       // Don't allow redefining names from this library.
       if (currentNames.containsKey(export.name)) continue;
 
-      _loader.emitDeclaration(export);
+      if (export.isSynthetic && export is PropertyInducingElement) {
+        _loader.emitDeclaration(export.getter);
+        _loader.emitDeclaration(export.setter);
+      } else {
+        _loader.emitDeclaration(export);
+      }
       if (export is ClassElement && export.typeParameters.isNotEmpty) {
         // Export the generic name as well.
         // TODO(jmesserly): revisit generic classes

diff --git a/pkg/dev_compiler/test/codegen/language/export_order_helper1.dart b/pkg/dev_compiler/test/codegen/language/export_order_helper1.dart
@@ -3,3 +3,4 @@
 // BSD-style license that can be found in the LICENSE file.
 
 export 'export_order_test.dart';
+export 'export_order_helper2.dart' show z;
diff --git a/pkg/dev_compiler/test/codegen/language/export_order_helper2.dart b/pkg/dev_compiler/test/codegen/language/export_order_helper2.dart
@@ -7,3 +7,5 @@ import 'export_order_helper1.dart';
 class Info {
   int x = y;
 }
+
+int get z => 38;
diff --git a/pkg/dev_compiler/test/codegen/language/export_order_test.dart b/pkg/dev_compiler/test/codegen/language/export_order_test.dart
@@ -12,4 +12,5 @@ final info = new Info();
 void main() {
   Expect.equals(38, info.x);
   Expect.equals(38, bar.y);
+  Expect.equals(38, bar.z);
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,4 @@
		// BSD-style license that can be found in the LICENSE file.

		export 'export_order_test.dart';
		export 'export_order_helper2.dart' show z;