Version 0.5.14.3 .

svn merge -c 23669 https://dart.googlecode.com/svn/branches/bleeding_edge/dart dart

Review URL: https://codereview.chromium.org//16147005

git-svn-id: http://dart.googlecode.com/svn/trunk@23687 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart b/sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart
index b1786bb..6bbd6d5 100644
--- a/sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart
+++ b/sdk/lib/_internal/compiler/implementation/js_backend/emitter.dart
@@ -1495,10 +1495,12 @@
         separator = ',';
         if (compiler.mirrorsEnabled) {
           var metadata = buildMetadataFunction(member);
-          fieldMetadata.add(metadata);
           if (metadata != null) {
             hasMetadata = true;
+          } else {
+            metadata = new jsAst.LiteralNull();
           }
+          fieldMetadata.add(metadata);
         }
         if (!needsAccessor) {
           // Emit field for constructor generation.
diff --git a/tests/lib/mirrors/metadata_test.dart b/tests/lib/mirrors/metadata_test.dart
index 8b54b6e..fbd888a 100644
--- a/tests/lib/mirrors/metadata_test.dart
+++ b/tests/lib/mirrors/metadata_test.dart
@@ -17,6 +17,7 @@
 class MyClass {
   @hest @hest @symbol
   var x;
+  var y;
 
   @string @symbol @string
   myMethod() => 1;
@@ -62,5 +63,8 @@
   VariableMirror xMirror = myClassMirror.variables[const Symbol('x')];
   checkMetadata(xMirror, [hest, hest, symbol]);
 
+  VariableMirror yMirror = myClassMirror.variables[const Symbol('y')];
+  checkMetadata(yMirror, []);
+
   // TODO(ahe): Test local functions.
 }
diff --git a/tools/VERSION b/tools/VERSION
index b30784a..49da9c5 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -1,4 +1,4 @@
 MAJOR 0
 MINOR 5
 BUILD 14
-PATCH 2
+PATCH 3