Version 1.9.0-dev.9.1
Fix badly merged files from 1.9.0-dev.9.0
git-svn-id: http://dart.googlecode.com/svn/trunk@44018 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart
index 0154d14..b86781b 100644
--- a/pkg/analysis_server/lib/src/analysis_server.dart
+++ b/pkg/analysis_server/lib/src/analysis_server.dart
@@ -1273,41 +1273,6 @@
/**
- * Container with global [AnalysisServer] performance statistics.
- */
-class ServerPerformanceStatistics {
- /**
- * The [PerformanceTag] for time spent in
- * PerformAnalysisOperation._updateIndex.
- */
- static PerformanceTag index = new PerformanceTag('index');
-
- /**
- * The [PerformanceTag] for time spent in
- * PerformAnalysisOperation._sendNotices.
- */
- static PerformanceTag notices = new PerformanceTag('notices');
-
- /**
- * The [PerformanceTag] for time spent performing a _DartIndexOperation.
- */
- static PerformanceTag indexOperation = new PerformanceTag('indexOperation');
-
- /**
- * The [PerformanceTag] for time spent between calls to
- * AnalysisServer.performOperation when the server is not idle.
- */
- static PerformanceTag intertask = new PerformanceTag('intertask');
-
- /**
- * The [PerformanceTag] for time spent between calls to
- * AnalysisServer.performOperation when the server is idle.
- */
- static PerformanceTag idle = new PerformanceTag('idle');
-}
-
-
-/**
* A class used by [AnalysisServer] to record performance information
* such as request latency.
*/
diff --git a/pkg/analysis_server/test/domain_completion_test.dart b/pkg/analysis_server/test/domain_completion_test.dart
index cfe1bb2..e042afa 100644
--- a/pkg/analysis_server/test/domain_completion_test.dart
+++ b/pkg/analysis_server/test/domain_completion_test.dart
@@ -675,7 +675,6 @@
return new MockCompletionManager(mockContext, source, searchEngine);
}
}
-<<<<<<< .working
@reflectiveTest
class _NoSearchEngine extends AbstractAnalysisTest {
@@ -700,4 +699,3 @@
expect(response.error.code, RequestErrorCode.NO_INDEX_GENERATED);
}
}
->>>>>>> .merge-right.r43886
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
index 1a45e9b..0b59021 100644
--- a/pkg/analyzer/lib/src/generated/resolver.dart
+++ b/pkg/analyzer/lib/src/generated/resolver.dart
@@ -10041,7 +10041,6 @@
static List<ResolvableLibrary> _EMPTY_ARRAY = new List<ResolvableLibrary>(0);
/**
-<<<<<<< .working
* The next artificial hash code.
*/
static int _NEXT_HASH_CODE = 0;
@@ -10049,25 +10048,9 @@
/**
* The artifitial hash code for this object.
*/
-<<<<<<< .working
final int _hashCode = _nextHashCode();
/**
-=======
- * The next artificial hash code.
- */
- static int _NEXT_HASH_CODE = 0;
-
- /**
- * The artifitial hash code for this object.
- */
- final int _hashCode = _NEXT_HASH_CODE++;
-=======
- final int _hashCode = _nextHashCode();
->>>>>>> .merge-right.r43886
-
- /**
->>>>>>> .merge-right.r43835
* The source specifying the defining compilation unit of this library.
*/
final Source librarySource;
diff --git a/runtime/lib/linked_hash_map.cc b/runtime/lib/linked_hash_map.cc
index a669bff..90d92af 100644
--- a/runtime/lib/linked_hash_map.cc
+++ b/runtime/lib/linked_hash_map.cc
@@ -15,7 +15,6 @@
DEFINE_FLAG(bool, use_internal_hash_map, false, "Use internal hash map.");
DEFINE_FLAG(bool, use_compact_hash, true, "Use compact hash map and set.");
->>>>>>> .merge-right.r43886
DEFINE_NATIVE_ENTRY(LinkedHashMap_allocate, 1) {
const TypeArguments& type_arguments =
diff --git a/runtime/lib/stacktrace.cc b/runtime/lib/stacktrace.cc
index f376ed3..6175b24 100644
--- a/runtime/lib/stacktrace.cc
+++ b/runtime/lib/stacktrace.cc
@@ -46,7 +46,6 @@
const Stacktrace& stacktrace = Stacktrace::Handle(
Stacktrace::New(code_array, pc_offset_array));
OS::PrintErr("=== Current Trace:\n%s===\n", stacktrace.ToCString());
->>>>>>> .merge-right.r43886
}
} // namespace dart
diff --git a/runtime/vm/allocation.cc b/runtime/vm/allocation.cc
index 8b8a00d..bd3d5c6 100644
--- a/runtime/vm/allocation.cc
+++ b/runtime/vm/allocation.cc
@@ -35,7 +35,6 @@
return Allocate(size, zone);
}
-<<<<<<< .working
void StackResource::UnwindAbove(Isolate* isolate, StackResource* new_top) {
StackResource* current_resource = isolate->top_resource();
@@ -45,5 +44,4 @@
}
}
->>>>>>> .merge-right.r43886
} // namespace dart
diff --git a/runtime/vm/allocation.h b/runtime/vm/allocation.h
index d65e0df..787c8db 100644
--- a/runtime/vm/allocation.h
+++ b/runtime/vm/allocation.h
@@ -70,7 +70,6 @@
// Destroy stack resources of isolate above new_top, exclusive.
static void UnwindAbove(Isolate* isolate, StackResource* new_top);
->>>>>>> .merge-right.r43886
private:
BaseIsolate* const isolate_; // Current isolate for this stack resource.
StackResource* previous_;
diff --git a/runtime/vm/exceptions.cc b/runtime/vm/exceptions.cc
index 7247d0f..6ece008 100644
--- a/runtime/vm/exceptions.cc
+++ b/runtime/vm/exceptions.cc
@@ -221,7 +221,6 @@
// Prepare for unwinding frames by destroying all the stack resources
// in the previous frames.
StackResource::Unwind(isolate);
->>>>>>> .merge-right.r43886
// Call a stub to set up the exception object in kExceptionObjectReg,
// to set up the stacktrace object in kStackTraceObjectReg, and to
diff --git a/runtime/vm/intermediate_language.cc b/runtime/vm/intermediate_language.cc
index d024f38..9fd75a2 100644
--- a/runtime/vm/intermediate_language.cc
+++ b/runtime/vm/intermediate_language.cc
@@ -1566,7 +1566,6 @@
}
-<<<<<<< .working
static bool IsRepresentable(const Integer& value, Representation rep) {
switch (rep) {
case kTagged: // Smi case.
diff --git a/runtime/vm/longjump.cc b/runtime/vm/longjump.cc
index 811cc61..3ca64b3 100644
--- a/runtime/vm/longjump.cc
+++ b/runtime/vm/longjump.cc
@@ -56,7 +56,6 @@
// Destruct all the active StackResource objects.
StackResource::UnwindAbove(isolate, top_);
->>>>>>> .merge-right.r43886
longjmp(environment_, value);
UNREACHABLE();
}
diff --git a/runtime/vm/parser.cc b/runtime/vm/parser.cc
index 2de53d4..dfa44c5 100644
--- a/runtime/vm/parser.cc
+++ b/runtime/vm/parser.cc
@@ -5994,8 +5994,6 @@
// to load the stack trace object (:stack_trace_var) into the stack
// trace variable specified in this block.
current_block_->statements->Add(new(Z) StoreLocalNode(
->>>>>>> .merge-right.r43886
- current_block_->statements->Add(new(Z) StoreLocalNode(
Scanner::kNoSourcePos,
stack_trace_param.var,
new(Z) LoadLocalNode(Scanner::kNoSourcePos, stack_trace_var)));
diff --git a/runtime/vm/simulator_arm.cc b/runtime/vm/simulator_arm.cc
index c181db5..477ee78 100644
--- a/runtime/vm/simulator_arm.cc
+++ b/runtime/vm/simulator_arm.cc
@@ -57,8 +57,6 @@
sim->set_last_setjmp_buffer(this);
sp_ = static_cast<uword>(sim->get_register(SP));
}
->>>>>>> .merge-right.r43886
- }
~SimulatorSetjmpBuffer() {
ASSERT(simulator_->last_setjmp_buffer() == this);
@@ -3859,7 +3857,6 @@
// Prepare for unwinding frames by destroying all the stack resources
// in the previous C++ frames.
StackResource::Unwind(isolate);
->>>>>>> .merge-right.r43886
// Unwind the C++ stack and continue simulation in the target frame.
set_register(PC, static_cast<int32_t>(pc));
diff --git a/runtime/vm/simulator_arm64.cc b/runtime/vm/simulator_arm64.cc
index 7ffde6f..763bc75 100644
--- a/runtime/vm/simulator_arm64.cc
+++ b/runtime/vm/simulator_arm64.cc
@@ -56,8 +56,6 @@
sim->set_last_setjmp_buffer(this);
sp_ = static_cast<uword>(sim->get_register(R31, R31IsSP));
}
->>>>>>> .merge-right.r43886
- }
~SimulatorSetjmpBuffer() {
ASSERT(simulator_->last_setjmp_buffer() == this);
@@ -3482,7 +3480,6 @@
// Prepare for unwinding frames by destroying all the stack resources
// in the previous C++ frames.
StackResource::Unwind(isolate);
->>>>>>> .merge-right.r43886
// Unwind the C++ stack and continue simulation in the target frame.
set_pc(static_cast<int64_t>(pc));
diff --git a/runtime/vm/simulator_mips.cc b/runtime/vm/simulator_mips.cc
index 9dece24..634eed1 100644
--- a/runtime/vm/simulator_mips.cc
+++ b/runtime/vm/simulator_mips.cc
@@ -56,8 +56,6 @@
sim->set_last_setjmp_buffer(this);
sp_ = static_cast<uword>(sim->get_register(SP));
}
->>>>>>> .merge-right.r43886
- }
~SimulatorSetjmpBuffer() {
ASSERT(simulator_->last_setjmp_buffer() == this);
@@ -2475,7 +2473,6 @@
// Prepare for unwinding frames by destroying all the stack resources
// in the previous C++ frames.
StackResource::Unwind(isolate);
->>>>>>> .merge-right.r43886
// Unwind the C++ stack and continue simulation in the target frame.
set_pc(static_cast<int32_t>(pc));
diff --git a/sdk/lib/_internal/compiler/js_lib/constant_map.dart b/sdk/lib/_internal/compiler/js_lib/constant_map.dart
index 1742e61..ae3e379 100644
--- a/sdk/lib/_internal/compiler/js_lib/constant_map.dart
+++ b/sdk/lib/_internal/compiler/js_lib/constant_map.dart
@@ -112,13 +112,11 @@
// We cannot create the backing map on creation since hashCode interceptors
// have not been defined when constants are created.
Map<K, V> _getMap() {
-<<<<<<< .working
LinkedHashMap<K, V> backingMap = JS('LinkedHashMap|Null', r'#.$map', this);
if (backingMap == null) {
backingMap = new JsLinkedHashMap<K, V>();
fillLiteralMap(_jsData, backingMap);
JS('', r'#.$map = #', this, backingMap);
->>>>>>> .merge-right.r43886
}
return backingMap;
}
diff --git a/tests/corelib/hash_map2_test.dart b/tests/corelib/hash_map2_test.dart
index 32c72eb..baaf143 100644
--- a/tests/corelib/hash_map2_test.dart
+++ b/tests/corelib/hash_map2_test.dart
@@ -1,12 +1,10 @@
// Copyright (c) 2013, 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.
-<<<<<<< .working
//
// VMOptions=
// VMOptions=--use_compact_hash=false
// VMOptions=--use_internal_hash_map --use_compact_hash=false
->>>>>>> .merge-right.r43886
// Tests of hash map behavior, with focus in iteration and concurrent
// modification errors.
diff --git a/tests/corelib/hash_map_test.dart b/tests/corelib/hash_map_test.dart
index 4d9ca76..76b1367 100644
--- a/tests/corelib/hash_map_test.dart
+++ b/tests/corelib/hash_map_test.dart
@@ -1,12 +1,10 @@
// Copyright (c) 2011, 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.
-<<<<<<< .working
//
// VMOptions=
// VMOptions=--use_compact_hash=false
// VMOptions=--use_internal_hash_map --use_compact_hash=false
->>>>>>> .merge-right.r43886
import "package:expect/expect.dart";
diff --git a/tests/corelib/hash_set_test.dart b/tests/corelib/hash_set_test.dart
index c3fbd68..b0730e7 100644
--- a/tests/corelib/hash_set_test.dart
+++ b/tests/corelib/hash_set_test.dart
@@ -1,11 +1,9 @@
// Copyright (c) 2013, 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.
-<<<<<<< .working
//
// VMOptions=
// VMOptions=--use_compact_hash=false
->>>>>>> .merge-right.r43886
// Tests of hash set behavior, with focus in iteration and concurrent
// modification errors.
diff --git a/tests/lib/analyzer/analyze_library.status b/tests/lib/analyzer/analyze_library.status
index 652386e..5d72855 100644
--- a/tests/lib/analyzer/analyze_library.status
+++ b/tests/lib/analyzer/analyze_library.status
@@ -17,7 +17,6 @@
lib/web_sql/dart2js/web_sql_dart2js: CompileTimeError # Issue 16522
[ $compiler == dart2analyzer ]
-lib/async/async: CompileTimeError # Issue 22415
lib/web_gl/dartium/web_gl_dartium: CompileTimeError # Issue 21647
lib/web_sql/dartium/web_sql_dartium: CompileTimeError # Issue 21647
lib/html/dartium/html_dartium: CompileTimeError # Issue 21647
diff --git a/tools/VERSION b/tools/VERSION
index b1a42ea..b3b2d5a 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
MINOR 9
PATCH 0
PRERELEASE 9
-PRERELEASE_PATCH 0
+PRERELEASE_PATCH 1
