diff --git a/runtime/observatory/tests/service/get_retaining_path_rpc_test.dart b/runtime/observatory/tests/service/get_retaining_path_rpc_test.dart index c2abb01bf95..bd235446c84 100644 --- a/runtime/observatory/tests/service/get_retaining_path_rpc_test.dart +++ b/runtime/observatory/tests/service/get_retaining_path_rpc_test.dart @@ -10,9 +10,9 @@ import 'test_helper.dart'; class _TestClass { _TestClass(); // Make sure these fields are not removed by the tree shaker. - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation dynamic x; - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation dynamic y; } @@ -22,6 +22,7 @@ dynamic target3 = new _TestClass(); dynamic target4 = new _TestClass(); dynamic target5 = new _TestClass(); dynamic target6 = new _TestClass(); +@pragma("vm:entry-point") // Prevent obfuscation Expando<_TestClass> expando = Expando<_TestClass>(); @pragma("vm:entry-point") // Prevent obfuscation dynamic globalObject = new _TestClass(); @@ -40,45 +41,45 @@ void warmup() { globalMap2[target5] = 'value'; } -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation getGlobalObject() => globalObject; -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation takeTarget1() { var tmp = target1; target1 = null; return tmp; } -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation takeTarget2() { var tmp = target2; target2 = null; return tmp; } -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation takeTarget3() { var tmp = target3; target3 = null; return tmp; } -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation takeTarget4() { var tmp = target4; target4 = null; return tmp; } -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation takeTarget5() { var tmp = target5; target5 = null; return tmp; } -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation takeExpandoTarget() { var tmp = target6; target6 = null; @@ -87,7 +88,7 @@ takeExpandoTarget() { return tmp2; } -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation getTrue() => true; invoke(Isolate isolate, String selector) async { @@ -216,7 +217,6 @@ var tests = [ expect(result['elements'][1]['parentMapKey']['class']['name'], equals('_TestClass')); expect(result['elements'][2]['parentListIndex'], isNotNull); - expect(result['elements'][3]['value']['class']['name'], 'Expando'); expect(result['elements'][4]['value']['name'], 'expando'); }, diff --git a/runtime/observatory/tests/service/get_user_level_retaining_path_rpc_test.dart b/runtime/observatory/tests/service/get_user_level_retaining_path_rpc_test.dart index 535c8824817..4273caf3219 100644 --- a/runtime/observatory/tests/service/get_user_level_retaining_path_rpc_test.dart +++ b/runtime/observatory/tests/service/get_user_level_retaining_path_rpc_test.dart @@ -13,13 +13,16 @@ class _TestClass { var y; } +@pragma("vm:entry-point") // Prevent obfuscation class _TestConst { const _TestConst(); } _TopLevelClosure() {} +@pragma("vm:entry-point") // Prevent obfuscation var x; +@pragma("vm:entry-point") // Prevent obfuscation var fn; void warmup() { @@ -27,10 +30,10 @@ void warmup() { fn = _TopLevelClosure; } -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation getX() => x; -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation getFn() => fn; invoke(Isolate isolate, String selector) async { diff --git a/runtime/observatory/tests/service/inbound_references_test.dart b/runtime/observatory/tests/service/inbound_references_test.dart index 548aa7ebb49..9e781c00f30 100644 --- a/runtime/observatory/tests/service/inbound_references_test.dart +++ b/runtime/observatory/tests/service/inbound_references_test.dart @@ -8,14 +8,16 @@ import 'package:observatory/service_io.dart'; import 'package:test/test.dart'; import 'test_helper.dart'; +@pragma("vm:entry-point") // Prevent obfuscation class Node { // Make sure this field is not removed by the tree shaker. - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation var edge; } class Edge {} +@pragma("vm:entry-point") // Prevent obfuscation var n, e, array; void script() { diff --git a/runtime/observatory/tests/service/object_graph_identity_hash_test.dart b/runtime/observatory/tests/service/object_graph_identity_hash_test.dart index eb7c1095810..66a029f0ead 100644 --- a/runtime/observatory/tests/service/object_graph_identity_hash_test.dart +++ b/runtime/observatory/tests/service/object_graph_identity_hash_test.dart @@ -8,40 +8,42 @@ import 'package:test/test.dart'; import 'service_test_common.dart'; import 'test_helper.dart'; +@pragma("vm:entry-point") // Prevent obfuscation class Foo {} +@pragma("vm:entry-point") // Prevent obfuscation class Bar {} class Container1 { - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation Foo foo = Foo(); - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation Bar bar = Bar(); } class Container2 { Container2(this.foo); - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation Foo foo; - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation Bar bar = Bar(); } class Container3 { - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation int number = 42; - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation double doub = 3.14; - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation String foo = 'foobar'; - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation bool bar = false; - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation late Map baz; - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation late List list; - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation late List unmodifiableList; Container3() { @@ -53,11 +55,11 @@ class Container3 { } } -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation late Container1 c1; -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation late Container2 c2; -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation late Container3 c3; void script() { diff --git a/runtime/observatory/tests/service/reachable_size_test.dart b/runtime/observatory/tests/service/reachable_size_test.dart index 8cf9f9ebcbe..db0a3eec28c 100644 --- a/runtime/observatory/tests/service/reachable_size_test.dart +++ b/runtime/observatory/tests/service/reachable_size_test.dart @@ -10,13 +10,15 @@ import 'service_test_common.dart'; class Pair { // Make sure these fields are not removed by the tree shaker. - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation dynamic x; - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation dynamic y; } +@pragma("vm:entry-point") // Prevent obfuscation dynamic p1; +@pragma("vm:entry-point") // Prevent obfuscation dynamic p2; buildGraph() { diff --git a/runtime/observatory/tests/service/string_escaping_test.dart b/runtime/observatory/tests/service/string_escaping_test.dart index d3061865580..866178c6fd0 100644 --- a/runtime/observatory/tests/service/string_escaping_test.dart +++ b/runtime/observatory/tests/service/string_escaping_test.dart @@ -9,20 +9,35 @@ import 'package:observatory/service_io.dart'; import 'package:test/test.dart'; import 'test_helper.dart'; +@pragma("vm:entry-point") // Prevent obfuscation var ascii; +@pragma("vm:entry-point") // Prevent obfuscation var latin1; +@pragma("vm:entry-point") // Prevent obfuscation var unicode; +@pragma("vm:entry-point") // Prevent obfuscation var hebrew; +@pragma("vm:entry-point") // Prevent obfuscation var singleQuotes; +@pragma("vm:entry-point") // Prevent obfuscation var doubleQuotes; +@pragma("vm:entry-point") // Prevent obfuscation var newLines; +@pragma("vm:entry-point") // Prevent obfuscation var tabs; +@pragma("vm:entry-point") // Prevent obfuscation var suggrogatePairs; +@pragma("vm:entry-point") // Prevent obfuscation var nullInTheMiddle; +@pragma("vm:entry-point") // Prevent obfuscation var escapedUnicodeEscape; +@pragma("vm:entry-point") // Prevent obfuscation var longStringEven; +@pragma("vm:entry-point") // Prevent obfuscation var longStringOdd; +@pragma("vm:entry-point") // Prevent obfuscation var malformedWithLeadSurrogate; +@pragma("vm:entry-point") // Prevent obfuscation var malformedWithTrailSurrogate; void script() { diff --git a/runtime/observatory/tests/service/typed_data_test.dart b/runtime/observatory/tests/service/typed_data_test.dart index 9c4ba3b2246..d37a79ff04f 100644 --- a/runtime/observatory/tests/service/typed_data_test.dart +++ b/runtime/observatory/tests/service/typed_data_test.dart @@ -9,25 +9,42 @@ import 'package:observatory/service_io.dart'; import 'package:test/test.dart'; import 'test_helper.dart'; +@pragma("vm:entry-point") // Prevent obfuscation var int8List; +@pragma("vm:entry-point") // Prevent obfuscation var int16List; +@pragma("vm:entry-point") // Prevent obfuscation var int32List; +@pragma("vm:entry-point") // Prevent obfuscation var int64List; +@pragma("vm:entry-point") // Prevent obfuscation var uint8List; +@pragma("vm:entry-point") // Prevent obfuscation var uint16List; +@pragma("vm:entry-point") // Prevent obfuscation var uint32List; +@pragma("vm:entry-point") // Prevent obfuscation var uint64List; +@pragma("vm:entry-point") // Prevent obfuscation var uint8ClampedList; +@pragma("vm:entry-point") // Prevent obfuscation var float32List; +@pragma("vm:entry-point") // Prevent obfuscation var float64List; +@pragma("vm:entry-point") // Prevent obfuscation var int32x4; +@pragma("vm:entry-point") // Prevent obfuscation var float32x4; +@pragma("vm:entry-point") // Prevent obfuscation var float64x2; +@pragma("vm:entry-point") // Prevent obfuscation var int32x4List; +@pragma("vm:entry-point") // Prevent obfuscation var float32x4List; +@pragma("vm:entry-point") // Prevent obfuscation var float64x2List; void script() { diff --git a/runtime/observatory_2/tests/service_2/get_retaining_path_rpc_test.dart b/runtime/observatory_2/tests/service_2/get_retaining_path_rpc_test.dart index 43f02e511dd..56ccd2e63e9 100644 --- a/runtime/observatory_2/tests/service_2/get_retaining_path_rpc_test.dart +++ b/runtime/observatory_2/tests/service_2/get_retaining_path_rpc_test.dart @@ -10,9 +10,9 @@ import 'test_helper.dart'; class _TestClass { _TestClass(); // Make sure these fields are not removed by the tree shaker. - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation var x; - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation var y; } @@ -22,6 +22,7 @@ var target3 = new _TestClass(); var target4 = new _TestClass(); var target5 = new _TestClass(); var target6 = new _TestClass(); +@pragma("vm:entry-point") // Prevent obfuscation Expando<_TestClass> expando = Expando<_TestClass>(); @pragma("vm:entry-point") // Prevent obfuscation var globalObject = new _TestClass(); @@ -40,45 +41,45 @@ void warmup() { globalMap2[target5] = 'value'; } -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation getGlobalObject() => globalObject; -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation takeTarget1() { var tmp = target1; target1 = null; return tmp; } -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation takeTarget2() { var tmp = target2; target2 = null; return tmp; } -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation takeTarget3() { var tmp = target3; target3 = null; return tmp; } -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation takeTarget4() { var tmp = target4; target4 = null; return tmp; } -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation takeTarget5() { var tmp = target5; target5 = null; return tmp; } -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation takeExpandoTarget() { var tmp = target6; target6 = null; @@ -87,7 +88,7 @@ takeExpandoTarget() { return tmp2; } -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation getTrue() => true; invoke(Isolate isolate, String selector) async { @@ -216,7 +217,6 @@ var tests = [ expect(result['elements'][1]['parentMapKey']['class']['name'], equals('_TestClass')); expect(result['elements'][2]['parentListIndex'], isNotNull); - expect(result['elements'][3]['value']['class']['name'], 'Expando'); expect(result['elements'][4]['value']['name'], 'expando'); }, diff --git a/runtime/observatory_2/tests/service_2/get_user_level_retaining_path_rpc_test.dart b/runtime/observatory_2/tests/service_2/get_user_level_retaining_path_rpc_test.dart index 45c8941d4e3..e88a74cdea3 100644 --- a/runtime/observatory_2/tests/service_2/get_user_level_retaining_path_rpc_test.dart +++ b/runtime/observatory_2/tests/service_2/get_user_level_retaining_path_rpc_test.dart @@ -13,13 +13,16 @@ class _TestClass { var y; } +@pragma("vm:entry-point") // Prevent obfuscation class _TestConst { const _TestConst(); } _TopLevelClosure() {} +@pragma("vm:entry-point") // Prevent obfuscation var x; +@pragma("vm:entry-point") // Prevent obfuscation var fn; void warmup() { @@ -27,10 +30,10 @@ void warmup() { fn = _TopLevelClosure; } -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation getX() => x; -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation getFn() => fn; invoke(Isolate isolate, String selector) async { diff --git a/runtime/observatory_2/tests/service_2/inbound_references_test.dart b/runtime/observatory_2/tests/service_2/inbound_references_test.dart index 6053042064e..40601e23d8d 100644 --- a/runtime/observatory_2/tests/service_2/inbound_references_test.dart +++ b/runtime/observatory_2/tests/service_2/inbound_references_test.dart @@ -8,14 +8,16 @@ import 'package:observatory_2/service_io.dart'; import 'package:test/test.dart'; import 'test_helper.dart'; +@pragma("vm:entry-point") // Prevent obfuscation class Node { // Make sure this field is not removed by the tree shaker. - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation var edge; } class Edge {} +@pragma("vm:entry-point") // Prevent obfuscation var n, e, array; void script() { diff --git a/runtime/observatory_2/tests/service_2/object_graph_identity_hash_test.dart b/runtime/observatory_2/tests/service_2/object_graph_identity_hash_test.dart index ed5c71b2a7b..3ab0ae12e20 100644 --- a/runtime/observatory_2/tests/service_2/object_graph_identity_hash_test.dart +++ b/runtime/observatory_2/tests/service_2/object_graph_identity_hash_test.dart @@ -8,40 +8,42 @@ import 'package:test/test.dart'; import 'service_test_common.dart'; import 'test_helper.dart'; +@pragma("vm:entry-point") // Prevent obfuscation class Foo {} +@pragma("vm:entry-point") // Prevent obfuscation class Bar {} class Container1 { - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation Foo foo = Foo(); - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation Bar bar = Bar(); } class Container2 { Container2(this.foo); - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation Foo foo; - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation Bar bar = Bar(); } class Container3 { - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation int number = 42; - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation double doub = 3.14; - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation String foo = 'foobar'; - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation bool bar = false; - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation Map baz; - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation List list; - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation List unmodifiableList; Container3() { @@ -53,11 +55,11 @@ class Container3 { } } -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation Container1 c1; -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation Container2 c2; -@pragma("vm:entry-point") +@pragma("vm:entry-point") // Prevent obfuscation Container3 c3; void script() { diff --git a/runtime/observatory_2/tests/service_2/reachable_size_test.dart b/runtime/observatory_2/tests/service_2/reachable_size_test.dart index f92962d64b4..5073e9caeb4 100644 --- a/runtime/observatory_2/tests/service_2/reachable_size_test.dart +++ b/runtime/observatory_2/tests/service_2/reachable_size_test.dart @@ -10,13 +10,15 @@ import 'service_test_common.dart'; class Pair { // Make sure these fields are not removed by the tree shaker. - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation var x; - @pragma("vm:entry-point") + @pragma("vm:entry-point") // Prevent obfuscation var y; } +@pragma("vm:entry-point") // Prevent obfuscation var p1; +@pragma("vm:entry-point") // Prevent obfuscation var p2; buildGraph() { diff --git a/runtime/observatory_2/tests/service_2/string_escaping_test.dart b/runtime/observatory_2/tests/service_2/string_escaping_test.dart index 6a9c829d6a2..4d48a3f9a15 100644 --- a/runtime/observatory_2/tests/service_2/string_escaping_test.dart +++ b/runtime/observatory_2/tests/service_2/string_escaping_test.dart @@ -9,20 +9,35 @@ import 'package:observatory_2/service_io.dart'; import 'package:test/test.dart'; import 'test_helper.dart'; +@pragma("vm:entry-point") // Prevent obfuscation var ascii; +@pragma("vm:entry-point") // Prevent obfuscation var latin1; +@pragma("vm:entry-point") // Prevent obfuscation var unicode; +@pragma("vm:entry-point") // Prevent obfuscation var hebrew; +@pragma("vm:entry-point") // Prevent obfuscation var singleQuotes; +@pragma("vm:entry-point") // Prevent obfuscation var doubleQuotes; +@pragma("vm:entry-point") // Prevent obfuscation var newLines; +@pragma("vm:entry-point") // Prevent obfuscation var tabs; +@pragma("vm:entry-point") // Prevent obfuscation var suggrogatePairs; +@pragma("vm:entry-point") // Prevent obfuscation var nullInTheMiddle; +@pragma("vm:entry-point") // Prevent obfuscation var escapedUnicodeEscape; +@pragma("vm:entry-point") // Prevent obfuscation var longStringEven; +@pragma("vm:entry-point") // Prevent obfuscation var longStringOdd; +@pragma("vm:entry-point") // Prevent obfuscation var malformedWithLeadSurrogate; +@pragma("vm:entry-point") // Prevent obfuscation var malformedWithTrailSurrogate; void script() { diff --git a/runtime/observatory_2/tests/service_2/typed_data_test.dart b/runtime/observatory_2/tests/service_2/typed_data_test.dart index 3de01a85db9..e6ae72493b8 100644 --- a/runtime/observatory_2/tests/service_2/typed_data_test.dart +++ b/runtime/observatory_2/tests/service_2/typed_data_test.dart @@ -9,25 +9,42 @@ import 'package:observatory_2/service_io.dart'; import 'package:test/test.dart'; import 'test_helper.dart'; +@pragma("vm:entry-point") // Prevent obfuscation var int8List; +@pragma("vm:entry-point") // Prevent obfuscation var int16List; +@pragma("vm:entry-point") // Prevent obfuscation var int32List; +@pragma("vm:entry-point") // Prevent obfuscation var int64List; +@pragma("vm:entry-point") // Prevent obfuscation var uint8List; +@pragma("vm:entry-point") // Prevent obfuscation var uint16List; +@pragma("vm:entry-point") // Prevent obfuscation var uint32List; +@pragma("vm:entry-point") // Prevent obfuscation var uint64List; +@pragma("vm:entry-point") // Prevent obfuscation var uint8ClampedList; +@pragma("vm:entry-point") // Prevent obfuscation var float32List; +@pragma("vm:entry-point") // Prevent obfuscation var float64List; +@pragma("vm:entry-point") // Prevent obfuscation var int32x4; +@pragma("vm:entry-point") // Prevent obfuscation var float32x4; +@pragma("vm:entry-point") // Prevent obfuscation var float64x2; +@pragma("vm:entry-point") // Prevent obfuscation var int32x4List; +@pragma("vm:entry-point") // Prevent obfuscation var float32x4List; +@pragma("vm:entry-point") // Prevent obfuscation var float64x2List; void script() {