Fix merge problem in the top-level compiler.

src/compiler.cc

 // Copyright 2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 632 matching lines @@
     Visit(stmts->at(i));
     CHECK_BAILOUT;
   }
 }
 
 
 void CodeGenSelector::VisitDeclaration(Declaration* decl) {
   if (decl->fun() != NULL) {
     ProcessExpression(decl->fun(), Expression::kValue);
   }
-  Variable* var = decl->proxy()->var();
-  ASSERT_NOT_NULL(var);
-  if ((!var->is_global() && decl->fun() != NULL)) {
-    BAILOUT("Non-global function declaration");
-  }
-  if ((!var->is_global() &&
-       var->slot() != NULL &&
-       var->slot()->type() == Slot::LOOKUP)) {
-    BAILOUT("Lookup slot encountered in declaration");
-  }
 }
 
 
 void CodeGenSelector::VisitBlock(Block* stmt) {
   VisitStatements(stmt->statements());
 }
 
 
 void CodeGenSelector::VisitExpressionStatement(ExpressionStatement* stmt) {
   ProcessExpression(stmt->expression(), Expression::kEffect);
@@ skipping 435 matching lines @@
 
 void CodeGenSelector::VisitThisFunction(ThisFunction* expr) {
   BAILOUT("ThisFunction");
 }
 
 #undef BAILOUT
 #undef CHECK_BAILOUT
 
 
 } }  // namespace v8::internal