Fix "is Object" to always be true in Dart.

frog/gen.dart

 // 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.
 
 /**
  * Top level generator object for writing code and keeping track of
  * dependencies.
  *
  * Should have two compilation models, but only one implemented so far.
  *
@@ skipping 1306 matching lines @@
       var ex = _scope.declare(catch_.exception);
       _scope.rethrow = ex;
       writer.nextBlock('} catch (${ex.code}) {');
       if (catch_.trace != null) {
         var trace = _scope.declare(catch_.trace);
         writer.writeln('var ${trace.code} = \$stackTraceOf(${ex.code});');
         world.gen.corejs.useStackTraceOf = true;
       }
       _genToDartException(ex.code, node);
 
-      if (!ex.type.isVar) {
+      if (!ex.type.isVarOrObject) {
         var test = ex.instanceOf(this, ex.type, catch_.exception.span,
             isTrue:false, forceCheck:true);
         writer.writeln('if (${test.code}) throw ${ex.code};');
       }
       visitStatementsInBlock(node.catches[0].body);
       _popBlock();
     } else if (node.catches.length > 0) {
       // Handle more than one catch
       _pushBlock();
       var ex = _scope.create('\$ex', world.varType, null);
       _scope.rethrow = ex;
       writer.nextBlock('} catch (${ex.code}) {');
       var trace = null;
       if (node.catches.some((c) => c.trace != null)) {
         trace = _scope.create('\$trace', world.varType, null);
         writer.writeln('var ${trace.code} = \$stackTraceOf(${ex.code});');
         world.gen.corejs.useStackTraceOf = true;
       }
       _genToDartException(ex.code, node);
 
-      // We need a rethrow unless we encounter a "var" catch
+      // We need a rethrow unless we encounter a "var" or "Object" catch
       bool needsRethrow = true;
 
       for (int i = 0; i < node.catches.length; i++) {
         var catch_ = node.catches[i];
 
         _pushBlock();
         var tmp = _scope.declare(catch_.exception);
-        if (!tmp.type.isVar) {
+        if (!tmp.type.isVarOrObject) {
           var test = ex.instanceOf(this, tmp.type, catch_.exception.span,
               isTrue:true, forceCheck:true);
           if (i == 0) {
             writer.enterBlock('if (${test.code}) {');
           } else {
             writer.nextBlock('} else if (${test.code}) {');
           }
         } else if (i > 0) {
           writer.nextBlock('} else {');
         }
 
         writer.writeln('var ${tmp.code} = ${ex.code};');
         if (catch_.trace != null) {
           // TODO(jmesserly): ensure this is the right type
           var tmptrace = _scope.declare(catch_.trace);
           writer.writeln('var ${tmptrace.code} = ${trace.code};');
         }
 
         visitStatementsInBlock(catch_.body);
         _popBlock();
 
-        if (tmp.type.isVar) {
+        if (tmp.type.isVarOrObject) {
           // We matched this for sure; no need to keep going
           if (i + 1 < node.catches.length) {
             world.warning('Unreachable catch clause', node.catches[i + 1]);
           }
           if (i > 0) {
             // Close the else block
             writer.exitBlock('}');
           }
           needsRethrow = false;
           break;
@@ skipping 857 matching lines @@
       result.add(new Value(world.varType, '\$$i', null, /*needsTemp:*/false));
     }
     for (int i = bareCount; i < length; i++) {
       var name = getName(i);
       if (name == null) name = '\$$i';
       result.add(new Value(world.varType, name, null, /*needsTemp:*/false));
     }
     return new Arguments(nodes, result);
   }
 }