Implement --noUnsafe compiler option (AssemblyScript#710)

Author: dcodeIO

cli/asc.js

@@ -550,6 +550,7 @@ exports.main = function main(argv, options, callback) {
   assemblyscript.setMemoryBase(compilerOptions, args.memoryBase >>> 0);
   assemblyscript.setSourceMap(compilerOptions, args.sourceMap != null);
   assemblyscript.setOptimizeLevelHints(compilerOptions, optimizeLevel, shrinkLevel);
+  assemblyscript.setNoUnsafe(compilerOptions, args.noUnsafe);
 
   // Initialize default aliases
   assemblyscript.setGlobalAlias(compilerOptions, "Math", "NativeMath");

cli/asc.json

@@ -94,6 +94,14 @@
     "type": "s",
     "default": "full"
   },
+  "noUnsafe": {
+    "description": [
+      "Disallows the use of unsafe features in user code.",
+      "Does not affect library files and external modules."
+    ],
+    "type": "b",
+    "default": false
+  },
   "debug": {
     "description": "Enables debug information in emitted binaries.",
     "type": "b",

src/ast.ts

@@ -1585,12 +1585,14 @@ export abstract class Statement extends Node { }
 
 /** Indicates the specific kind of a source. */
 export enum SourceKind {
-  /** Default source. Usually imported from an entry file. */
-  DEFAULT,
-  /** Entry file. */
-  ENTRY,
-  /** Library file. */
-  LIBRARY
+  /** User-provided file. */
+  USER = 0,
+  /** User-provided entry file. */
+  USER_ENTRY = 1,
+  /** Library-provided file. */
+  LIBRARY = 2,
+  /** Library-provided entry file. */
+  LIBRARY_ENTRY = 3
 }
 
 /** A top-level source node. */
@@ -1631,10 +1633,10 @@ export class Source extends Node {
     this.text = text;
   }
 
-  /** Tests if this source is an entry file. */
-  get isEntry(): bool { return this.sourceKind == SourceKind.ENTRY; }
-  /** Tests if this source is a stdlib file. */
-  get isLibrary(): bool { return this.sourceKind == SourceKind.LIBRARY; }
+  get isLibrary(): bool {
+    var kind = this.sourceKind;
+    return kind == SourceKind.LIBRARY || kind == SourceKind.LIBRARY_ENTRY;
+  }
 }
 
 /** Base class of all declaration statements. */

src/compiler.ts

@@ -157,7 +157,8 @@ import {
   nodeIsConstantValue,
   findDecorator,
   isTypeOmitted,
-  ExportDefaultStatement
+  ExportDefaultStatement,
+  SourceKind
 } from "./ast";
 
 import {
@@ -201,6 +202,8 @@ export class Options {
   globalAliases: Map<string,string> | null = null;
   /** Additional features to activate. */
   features: Feature = Feature.NONE;
+  /** If true, disallows unsafe features in user code. */
+  noUnsafe: bool = false;
 
   /** Hinted optimize level. Not applied by the compiler itself. */
   optimizeLevelHint: i32 = 0;
@@ -359,7 +362,7 @@ export class Compiler extends DiagnosticEmitter {
     // compile entry file(s) while traversing reachable elements
     var files = program.filesByName;
     for (let file of files.values()) {
-      if (file.source.isEntry) {
+      if (file.source.sourceKind == SourceKind.USER_ENTRY) {
         this.compileFile(file);
         this.compileExports(file);
       }
@@ -450,7 +453,7 @@ export class Compiler extends DiagnosticEmitter {
 
     // set up module exports
     for (let file of this.program.filesByName.values()) {
-      if (file.source.isEntry) this.ensureModuleExports(file);
+      if (file.source.sourceKind == SourceKind.USER_ENTRY) this.ensureModuleExports(file);
     }
     return module;
   }
@@ -5146,12 +5149,10 @@ export class Compiler extends DiagnosticEmitter {
         if (!this.compileGlobal(<Global>target)) return this.module.unreachable(); // reports
         // fall-through
       }
+      case ElementKind.LOCAL:
       case ElementKind.FIELD: {
         targetType = (<VariableLikeElement>target).type;
-        break;
-      }
-      case ElementKind.LOCAL: {
-        targetType = (<VariableLikeElement>target).type;
+        if (target.hasDecorator(DecoratorFlags.UNSAFE)) this.checkUnsafe(expression);
         break;
       }
       case ElementKind.PROPERTY_PROTOTYPE: { // static property
@@ -5167,6 +5168,7 @@ export class Compiler extends DiagnosticEmitter {
         if (!setterInstance) return this.module.unreachable();
         assert(setterInstance.signature.parameterTypes.length == 1); // parser must guarantee this
         targetType = setterInstance.signature.parameterTypes[0];
+        if (setterPrototype.hasDecorator(DecoratorFlags.UNSAFE)) this.checkUnsafe(expression);
         break;
       }
       case ElementKind.PROPERTY: { // instance property
@@ -5180,6 +5182,7 @@ export class Compiler extends DiagnosticEmitter {
         }
         assert(setterInstance.signature.parameterTypes.length == 1); // parser must guarantee this
         targetType = setterInstance.signature.parameterTypes[0];
+        if (setterInstance.hasDecorator(DecoratorFlags.UNSAFE)) this.checkUnsafe(expression);
         break;
       }
       case ElementKind.CLASS: {
@@ -5216,6 +5219,7 @@ export class Compiler extends DiagnosticEmitter {
           }
           assert(indexedSet.signature.parameterTypes.length == 2); // parser must guarantee this
           targetType = indexedSet.signature.parameterTypes[1];     // 2nd parameter is the element
+          if (indexedSet.hasDecorator(DecoratorFlags.UNSAFE)) this.checkUnsafe(expression);
           break;
         }
         // fall-through
@@ -5873,6 +5877,7 @@ export class Compiler extends DiagnosticEmitter {
             makeMap<string,Type>(flow.contextualTypeArguments)
           );
           if (!instance) return this.module.unreachable();
+          if (prototype.hasDecorator(DecoratorFlags.UNSAFE)) this.checkUnsafe(expression);
           return this.makeCallDirect(instance, argumentExprs, expression, contextualType == Type.void);
           // TODO: this skips inlining because inlining requires compiling its temporary locals in
           // the scope of the inlined flow. might need another mechanism to lock temp. locals early,
@@ -6010,6 +6015,8 @@ export class Compiler extends DiagnosticEmitter {
     expression: CallExpression,
     contextualType: Type
   ): ExpressionRef {
+    if (prototype.hasDecorator(DecoratorFlags.UNSAFE)) this.checkUnsafe(expression);
+
     var typeArguments: Type[] | null = null;
 
     // builtins handle omitted type arguments on their own. if present, however, resolve them here
@@ -6108,6 +6115,17 @@ export class Compiler extends DiagnosticEmitter {
     return true;
   }
 
+  /** Checks that an unsafe expression is allowed. */
+  private checkUnsafe(reportNode: Node): void {
+    // Library files may always use unsafe features
+    if (this.options.noUnsafe && !reportNode.range.source.isLibrary) {
+      this.error(
+        DiagnosticCode.Expression_is_unsafe,
+        reportNode.range
+      );
+    }
+  }
+
   /** Compiles a direct call to a concrete function. */
   compileCallDirect(
     instance: Function,
@@ -6127,6 +6145,7 @@ export class Compiler extends DiagnosticEmitter {
       this.currentType = signature.returnType;
       return this.module.unreachable();
     }
+    if (instance.hasDecorator(DecoratorFlags.UNSAFE)) this.checkUnsafe(reportNode);
 
     // Inline if explicitly requested
     if (instance.hasDecorator(DecoratorFlags.INLINE)) {
@@ -7688,6 +7707,7 @@ export class Compiler extends DiagnosticEmitter {
         );
         return module.unreachable();
       }
+      if (ctor.hasDecorator(DecoratorFlags.UNSAFE)) this.checkUnsafe(expression);
     }
 
     // check and compile field values
@@ -7905,6 +7925,7 @@ export class Compiler extends DiagnosticEmitter {
     reportNode: Node
   ): ExpressionRef {
     var ctor = this.ensureConstructor(classInstance, reportNode);
+    if (ctor.hasDecorator(DecoratorFlags.UNSAFE)) this.checkUnsafe(reportNode);
     var expr = this.compileCallDirect( // no need for another autoreleased local
       ctor,
       argumentExpressions,
@@ -7935,6 +7956,7 @@ export class Compiler extends DiagnosticEmitter {
 
     var target = this.resolver.resolvePropertyAccessExpression(propertyAccess, flow, contextualType); // reports
     if (!target) return module.unreachable();
+    if (target.hasDecorator(DecoratorFlags.UNSAFE)) this.checkUnsafe(propertyAccess);
 
     switch (target.kind) {
       case ElementKind.GLOBAL: { // static field

src/definitions.ts

@@ -32,6 +32,10 @@ import {
   TypeKind
 } from "./types";
 
+import {
+  SourceKind
+ } from "./ast";
+
 import {
   indent
 } from "./util";
@@ -55,7 +59,7 @@ abstract class ExportsWalker {
   /** Walks all elements and calls the respective handlers. */
   walk(): void {
     for (let file of this.program.filesByName.values()) {
-      if (file.source.isEntry) this.visitFile(file);
+      if (file.source.sourceKind == SourceKind.USER_ENTRY) this.visitFile(file);
     }
   }
 

src/diagnosticMessages.generated.ts

@@ -34,7 +34,7 @@ export enum DiagnosticCode {
   Module_cannot_have_multiple_start_functions = 221,
   _0_must_be_a_value_between_1_and_2_inclusive = 222,
   _0_must_be_a_power_of_two = 223,
-  TODO_Cannot_inline_inferred_calls_and_specific_internals_yet = 224,
+  Expression_is_unsafe = 224,
   Expression_is_never_null = 225,
   Unterminated_string_literal = 1002,
   Identifier_expected = 1003,
@@ -173,7 +173,7 @@ export function diagnosticCodeToString(code: DiagnosticCode): string {
     case 221: return "Module cannot have multiple start functions.";
     case 222: return "'{0}' must be a value between '{1}' and '{2}' inclusive.";
     case 223: return "'{0}' must be a power of two.";
-    case 224: return "TODO: Cannot inline inferred calls and specific internals yet.";
+    case 224: return "Expression is unsafe.";
     case 225: return "Expression is never 'null'.";
     case 1002: return "Unterminated string literal.";
     case 1003: return "Identifier expected.";

src/diagnosticMessages.json

@@ -26,7 +26,7 @@
   "Module cannot have multiple start functions.": 221,
   "'{0}' must be a value between '{1}' and '{2}' inclusive.": 222,
   "'{0}' must be a power of two.": 223,
-  "TODO: Cannot inline inferred calls and specific internals yet.": 224,
+  "Expression is unsafe.": 224,
   "Expression is never 'null'.": 225,
 
   "Unterminated string literal.": 1002,

src/index.ts

@@ -109,6 +109,11 @@ export function setExplicitStart(options: Options, explicitStart: bool): void {
   options.explicitStart = explicitStart;
 }
 
+/** Sets the `noUnsafe` option. */
+export function setNoUnsafe(options: Options, noUnsafe: bool): void {
+  options.noUnsafe = noUnsafe;
+}
+
 /** Sign extension operations. */
 export const FEATURE_SIGN_EXTENSION = Feature.SIGN_EXTENSION;
 /** Mutable global imports and exports. */

src/parser.ts

@@ -131,10 +131,12 @@ export class Parser extends DiagnosticEmitter {
       normalizedPath,
       text,
       isEntry
-        ? SourceKind.ENTRY
-        : path.startsWith(LIBRARY_PREFIX) && path.indexOf(PATH_DELIMITER, LIBRARY_PREFIX.length) < 0
-          ? SourceKind.LIBRARY
-          : SourceKind.DEFAULT
+        ? SourceKind.USER_ENTRY
+        : path.startsWith(LIBRARY_PREFIX)
+          ? path.indexOf(PATH_DELIMITER, LIBRARY_PREFIX.length) < 0
+            ? SourceKind.LIBRARY_ENTRY
+            : SourceKind.LIBRARY
+          : SourceKind.USER
     );
     var program = this.program;
     program.sources.push(source);

src/program.ts

@@ -410,7 +410,7 @@ export class Program extends DiagnosticEmitter {
     diagnostics: DiagnosticMessage[] | null = null
   ) {
     super(diagnostics);
-    var nativeSource = new Source(LIBRARY_SUBST, "[native code]", SourceKind.LIBRARY);
+    var nativeSource = new Source(LIBRARY_SUBST, "[native code]", SourceKind.LIBRARY_ENTRY);
     this.nativeSource = nativeSource;
     var nativeFile = new File(this, nativeSource);
     this.nativeFile = nativeFile;
@@ -876,8 +876,9 @@ export class Program extends DiagnosticEmitter {
     // mark module exports, i.e. to apply proper wrapping behavior on the boundaries
     for (let file of this.filesByName.values()) {
       let exports = file.exports;
-      if (!(file.source.isEntry && exports)) continue;
-      for (let element of exports.values()) this.markModuleExport(element);
+      if (exports !== null && file.source.sourceKind == SourceKind.USER_ENTRY) {
+        for (let element of exports.values()) this.markModuleExport(element);
+      }
     }
   }
 
@@ -2188,7 +2189,7 @@ export class File extends Element {
     var exports = this.exports;
     if (!exports) this.exports = exports = new Map();
     exports.set(name, element);
-    if (this.source.isLibrary) this.program.ensureGlobal(name, element);
+    if (this.source.sourceKind == SourceKind.LIBRARY_ENTRY) this.program.ensureGlobal(name, element);
   }
 
   /** Ensures that another file is a re-export of this file. */
@@ -2876,6 +2877,7 @@ export class Field extends VariableLikeElement {
     );
     this.prototype = prototype;
     this.flags = prototype.flags;
+    this.decoratorFlags = prototype.decoratorFlags;
     assert(type != Type.void);
     this.setType(type);
     registerConcreteElement(this.program, this);
@@ -2945,6 +2947,8 @@ export class Property extends VariableLikeElement {
       )
     );
     this.prototype = prototype;
+    this.flags = prototype.flags;
+    this.decoratorFlags = prototype.decoratorFlags;
     registerConcreteElement(this.program, this);
   }
 

src/resolver.ts

@@ -1505,10 +1505,12 @@ export class Resolver extends DiagnosticEmitter {
       }
       let typeNode = parameterDeclaration.type;
       if (isTypeOmitted(typeNode)) {
-        this.error(
-          DiagnosticCode.Type_expected,
-          typeNode.range
-        );
+        if (reportMode == ReportMode.REPORT) {
+          this.error(
+            DiagnosticCode.Type_expected,
+            typeNode.range
+          );
+        }
         return null;
       }
       let parameterType = this.resolveType(
@@ -1531,10 +1533,12 @@ export class Resolver extends DiagnosticEmitter {
     } else {
       let typeNode = signatureNode.returnType;
       if (isTypeOmitted(typeNode)) {
-        this.error(
-          DiagnosticCode.Type_expected,
-          typeNode.range
-        );
+        if (reportMode == ReportMode.REPORT) {
+          this.error(
+            DiagnosticCode.Type_expected,
+            typeNode.range
+          );
+        }
         return null;
       }
       let type = this.resolveType(