Experimental: merge from bleeding_edge. Merge up to and including...

src/codegen-ia32.h

 // Copyright 2006-2008 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 153 matching lines @@
 // CodeGenerator
 
 class CodeGenerator: public AstVisitor {
  public:
   // Takes a function literal, generates code for it. This function should only
   // be called by compiler.cc.
   static Handle<Code> MakeCode(FunctionLiteral* fun,
                                Handle<Script> script,
                                bool is_eval);
 
+#ifdef ENABLE_LOGGING_AND_PROFILING
   static bool ShouldGenerateLog(Expression* type);
+#endif
 
   static void SetFunctionInfo(Handle<JSFunction> fun,
                               int length,
                               int function_token_position,
                               int start_position,
                               int end_position,
                               bool is_expression,
                               bool is_toplevel,
                               Handle<Script> script);
 
@@ skipping 329 matching lines @@
   cgen_->set_in_spilled_code(false);
   GetValue(typeof_state);
   cgen_->frame()->SpillAll();
   cgen_->set_in_spilled_code(true);
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_CODEGEN_IA32_H_