Fix FLAG_always_opt and tools/push-to-trunk.sh

TEST=tests with --always-opt don't ASSERT; push to trunk workflow works.

Review URL: https://chromiumcodereview.appspot.com/9718035

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11080 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/factory.cc

@@ -554,7 +554,8 @@ Handle<JSFunction> Factory::NewFunctionFromSharedFunctionInfo(
       FLAG_always_opt &&
       result->is_compiled() &&
       !function_info->is_toplevel() &&
-      function_info->allows_lazy_compilation()) {
+      function_info->allows_lazy_compilation() &&
+      !function_info->optimization_disabled()) {
     result->MarkForLazyRecompilation();
   }
   return result;

tools/common-includes.sh

@@ -176,7 +176,7 @@ the uploaded CL."
 # Takes a file containing the patch to apply as first argument.
 apply_patch() {
   patch -p1 < "$1" > "$PATCH_OUTPUT_FILE" || \
-    cat "$PATCH_OUTPUT_FILE" && die "Applying the patch failed."
+    { cat "$PATCH_OUTPUT_FILE" && die "Applying the patch failed."; }
   tee < "$PATCH_OUTPUT_FILE" >(awk '{print $NF}' >> "$TOUCHED_FILES_FILE")
   rm "$PATCH_OUTPUT_FILE"
 }