[kernel] Fix loading of type argument in catch.

runtime/vm/kernel_binary_flowgraph.cc

 // Copyright (c) 2016, 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.
 
 #include "vm/kernel_binary_flowgraph.h"
 
 #include "vm/compiler.h"
 #include "vm/longjump.h"
 #include "vm/object_store.h"
 
@@ skipping 870 matching lines @@
 
       builder_->ReadBool();  // read any_catch_needs_stack_trace.
       intptr_t num_catches =
           builder_->ReadListLength();  // read number of catches.
       for (intptr_t i = 0; i < num_catches; ++i) {
         PositionScope scope(builder_->reader_);
         intptr_t offset = builder_->ReaderOffset();  // Catch has no tag.
 
         EnterScope(offset);
 
-        builder_->SkipDartType();   // read guard.
+        VisitDartType();            // read guard.

[Kevin Millikin (Google), 2017/06/21 07:02:58]

Update comments to be full sentences: "Read the guard."

         tag = builder_->ReadTag();  // read first part of exception.
         if (tag == kSomething) {
           VisitVariableDeclaration();  // read exception.
         }
         tag = builder_->ReadTag();  // read first part of stack trace.
         if (tag == kSomething) {
           VisitVariableDeclaration();  // read stack trace.
         }
         VisitStatement();  // read body.
 
@@ skipping 5633 matching lines @@
       }
     }
 
     if (type_guard != NULL) {
       if (type_guard->IsMalformed()) {
         catch_body += ThrowTypeError();
         catch_body += Drop();
       } else {
         catch_body += LoadLocal(CurrentException());
         catch_body += PushArgument();  // exception
-        catch_body += NullConstant();
+        if (!type_guard->IsInstantiated(kCurrentClass)) {
+          catch_body += LoadInstantiatorTypeArguments();
+        } else {
+          catch_body += NullConstant();
+        }
         catch_body += PushArgument();  // instantiator type arguments
-        catch_body += NullConstant();
+        if (!type_guard->IsInstantiated(kFunctions)) {
+          catch_body += LoadFunctionTypeArguments();
+        } else {
+          catch_body += NullConstant();
+        }
         catch_body += PushArgument();  // function type arguments
         catch_body += Constant(*type_guard);
         catch_body += PushArgument();  // guard type
         catch_body += InstanceCall(
             TokenPosition::kNoSource,
             dart::Library::PrivateCoreLibName(Symbols::_instanceOf()),
             Token::kIS, 4);
 
         TargetEntryInstr* catch_entry;
         TargetEntryInstr* next_catch_entry;
@@ skipping 592 matching lines @@
     metadata_values.SetAt(i, value);
   }
 
   return metadata_values.raw();
 }
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)