Version 0.3.6.1 .
svn merge -c 18445 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
git-svn-id: http://dart.googlecode.com/svn/trunk@18537 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/sdk/lib/_internal/compiler/implementation/dart2js.dart b/sdk/lib/_internal/compiler/implementation/dart2js.dart
index 5fdcd2c7..07d8e1f 100644
--- a/sdk/lib/_internal/compiler/implementation/dart2js.dart
+++ b/sdk/lib/_internal/compiler/implementation/dart2js.dart
@@ -151,6 +151,12 @@
return passThrough('--categories=${categories.join(",")}');
}
+ // TODO(8522): Remove this method once option is restored.
+ complainAboutDisallowUnsafeEval(String argument) {
+ fail('Error: $argument is currently not supported, '
+ 'see http://dartbug.com/8522');
+ }
+
handleShortOptions(String argument) {
var shortOptions = argument.substring(1).split("");
for (var shortOption in shortOptions) {
@@ -196,7 +202,8 @@
(_) => passThrough('--enable-concrete-type-inference')),
new OptionHandler(r'--help|/\?|/h', (_) => wantHelp = true),
new OptionHandler('--package-root=.+|-p.+', setPackageRoot),
- new OptionHandler('--disallow-unsafe-eval', passThrough),
+ new OptionHandler('--disallow-unsafe-eval',
+ complainAboutDisallowUnsafeEval),
new OptionHandler('--analyze-all', passThrough),
new OptionHandler('--analyze-only', setAnalyzeOnly),
new OptionHandler('--disable-native-live-type-analysis', passThrough),
@@ -434,12 +441,18 @@
Disable the optimization that removes unused native types from dart:html
and related libraries.
+'''
+/* TODO(8522): Restore this comment once option is restored.
+'''
--disallow-unsafe-eval
Disable dynamic generation of code in the generated output. This is
necessary to satisfy CSP restrictions (see http://www.w3.org/TR/CSP/).
This flag is not continuously tested. Please report breakages and we
will fix them as soon as possible.
+'''
+*/
+'''
--reject-deprecated-language-features
Reject deprecated language features. Without this option, the
compiler will accept language features that are no longer valid
diff --git a/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart b/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
index e60f8c9..e0ba156 100644
--- a/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
+++ b/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart
@@ -730,7 +730,8 @@
interceptedClasses = new LinkedHashMap<ClassElement, ClassElement>(),
super(compiler, JAVA_SCRIPT_CONSTANT_SYSTEM) {
emitter = disableEval
- ? new CodeEmitterNoEvalTask(compiler, namer, generateSourceMap)
+ // TODO(8522): Restore --disallow-unsafe-eval.
+ ? null // new CodeEmitterNoEvalTask(compiler, namer, generateSourceMap)
: new CodeEmitterTask(compiler, namer, generateSourceMap);
builder = new SsaBuilderTask(this);
optimizer = new SsaOptimizerTask(this);
diff --git a/sdk/lib/_internal/compiler/implementation/js_backend/js_backend.dart b/sdk/lib/_internal/compiler/implementation/js_backend/js_backend.dart
index 52e6ee0..0bfb5df 100644
--- a/sdk/lib/_internal/compiler/implementation/js_backend/js_backend.dart
+++ b/sdk/lib/_internal/compiler/implementation/js_backend/js_backend.dart
@@ -26,7 +26,8 @@
part 'constant_emitter.dart';
part 'constant_system_javascript.dart';
part 'emitter.dart';
-part 'emitter_no_eval.dart';
+// TODO(8522): Restore --disallow-unsafe-eval.
+// part 'emitter_no_eval.dart';
part 'minify_namer.dart';
part 'namer.dart';
part 'native_emitter.dart';
diff --git a/tools/VERSION b/tools/VERSION
index 94ffc7c..54a53be 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -1,4 +1,4 @@
MAJOR 0
MINOR 3
BUILD 6
-PATCH 0
+PATCH 1
