Merge of ErroneousElement and ErroneousFunctionElement

sdk/lib/_internal/compiler/implementation/ssa/builder.dart

 // Copyright (c) 2012, 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.
 
 part of ssa;
 
 class Interceptors {
   Compiler compiler;
   Interceptors(Compiler this.compiler);
 
@@ skipping 2246 matching lines @@
   HInstruction generateInstanceSendReceiver(Send send) {
     assert(Elements.isInstanceSend(send, elements));
     if (send.receiver == null) {
       return localsHandler.readThis();
     }
     visit(send.receiver);
     return pop();
   }
 
   String getTargetName(ErroneousElement error, [String prefix]) {
-    String result = error.targetName.slowToString();
+    String result = error.name.slowToString();
     if (?prefix) {
       result = '$prefix $result';
     }
     return result;
   }
 
   void generateInstanceGetterWithCompiledReceiver(Send send,
                                                   HInstruction receiver) {
     assert(Elements.isInstanceSend(send, elements));
     // TODO(kasperl): This is a convoluted way of checking if we're
@@ skipping 2060 matching lines @@
     // successor.
     if (endCatchBlock != null) {
       endCatchBlock.addSuccessor(
           startFinallyBlock != null ? startFinallyBlock : exitBlock);
     }
 
     // The finally block has the exit block as successor.
     if (endFinallyBlock != null) {
       endFinallyBlock.addSuccessor(exitBlock);
     }
-    
+
     // If a block inside try/catch aborts (eg with a return statement),
     // we explicitely mark this block a predecessor of the catch
     // block and the finally block.
     addExitTrySuccessor(startCatchBlock);
     addExitTrySuccessor(startFinallyBlock);
 
     // Use the locals handler not altered by the catch and finally
     // blocks.
     localsHandler = savedLocals;
     open(exitBlock);
@@ skipping 412 matching lines @@
           new HSubGraphBlockInformation(elseBranch.graph));
 
     HBasicBlock conditionStartBlock = conditionBranch.block;
     conditionStartBlock.setBlockFlow(info, joinBlock);
     SubGraph conditionGraph = conditionBranch.graph;
     HIf branch = conditionGraph.end.last;
     assert(branch is HIf);
     branch.blockInformation = conditionStartBlock.blockFlow;
   }
 }