Version 1.3.6
Merged bleeding edge revision 35524 to trunk by applying:
https://codereview.chromium.org/259743003/
Review URL: https://codereview.chromium.org//261443002
git-svn-id: http://dart.googlecode.com/svn/branches/1.3@35530 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/runtime/vm/assembler_x64.cc b/runtime/vm/assembler_x64.cc
index 1427cba..c581f69 100644
--- a/runtime/vm/assembler_x64.cc
+++ b/runtime/vm/assembler_x64.cc
@@ -45,17 +45,19 @@
patchable_pool_entries_.Add(kNotPatchable);
object_pool_index_table_.Insert(ObjIndexPair(Bool::False().raw(), 2));
+ const Smi& vacant = Smi::Handle(Smi::New(0xfa >> kSmiTagShift));
+
if (StubCode::UpdateStoreBuffer_entry() != NULL) {
FindExternalLabel(&StubCode::UpdateStoreBufferLabel(), kNotPatchable);
} else {
- object_pool_.Add(Object::null_object(), Heap::kOld);
+ object_pool_.Add(vacant, Heap::kOld);
patchable_pool_entries_.Add(kNotPatchable);
}
if (StubCode::CallToRuntime_entry() != NULL) {
FindExternalLabel(&StubCode::CallToRuntimeLabel(), kNotPatchable);
} else {
- object_pool_.Add(Object::null_object(), Heap::kOld);
+ object_pool_.Add(vacant, Heap::kOld);
patchable_pool_entries_.Add(kNotPatchable);
}
@@ -65,7 +67,7 @@
FindExternalLabel(&StubCode::BreakpointRuntimeLabel(), kNotPatchable);
ASSERT(index == kBreakpointRuntimeCPIndex);
} else {
- object_pool_.Add(Object::null_object(), Heap::kOld);
+ object_pool_.Add(vacant, Heap::kOld);
patchable_pool_entries_.Add(kNotPatchable);
}
}
diff --git a/runtime/vm/stub_code.h b/runtime/vm/stub_code.h
index 602253a..b90cb01 100644
--- a/runtime/vm/stub_code.h
+++ b/runtime/vm/stub_code.h
@@ -52,7 +52,6 @@
// List of stubs created per isolate, these stubs could potentially contain
// embedded objects and hence cannot be shared across isolates.
#define STUB_CODE_LIST(V) \
- V(InvokeDartCode) \
V(AllocateContext) \
V(UpdateStoreBuffer) \
V(OneArgCheckInlineCache) \
@@ -66,6 +65,7 @@
V(ZeroArgsUnoptimizedStaticCall) \
V(TwoArgsUnoptimizedStaticCall) \
V(OptimizeFunction) \
+ V(InvokeDartCode) \
// class StubEntry is used to describe stub methods generated in dart to
// abstract out common code executed from generated dart code.
diff --git a/tests/standalone/io/directory_list_sync_test.dart b/tests/standalone/io/directory_list_sync_test.dart
new file mode 100644
index 0000000..99d18fb
--- /dev/null
+++ b/tests/standalone/io/directory_list_sync_test.dart
@@ -0,0 +1,14 @@
+// Copyright (c) 2014, 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.
+
+import 'dart:io';
+
+void main() {
+ File script = new File.fromUri(Platform.script);
+ // tests/standalone/io/../../..
+ Directory startingDir = script.parent.parent.parent.parent;
+ List<FileSystemEntity> each =
+ startingDir.listSync(recursive: true, followLinks: false);
+ print("Found: ${each.length} entities");
+}
diff --git a/tools/VERSION b/tools/VERSION
index 33e4d99..19cb8ff 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -26,6 +26,6 @@
CHANNEL stable
MAJOR 1
MINOR 3
-PATCH 5
+PATCH 6
PRERELEASE 0
PRERELEASE_PATCH 0
