Merge revisions 6831 and 6833 to the 3.0 branch.

src/hydrogen.h

 // Copyright 2011 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 196 matching lines @@
   HGraph* graph() const { return graph_; }
   HEnvironment* environment() const {
     ASSERT(HasExit());
     return exit_block_->last_environment();
   }
 
   bool HasExit() const { return exit_block_ != NULL; }
 
   void PreProcessOsrEntry(IterationStatement* statement);
 
-  void AppendOptional(HSubgraph* graph,
-                      bool on_true_branch,
-                      HValue* boolean_value);
   void AppendJoin(HSubgraph* then_graph, HSubgraph* else_graph, AstNode* node);
   void AppendWhile(HSubgraph* condition,
                    HSubgraph* body,
                    IterationStatement* statement,
                    HSubgraph* continue_subgraph,
                    HSubgraph* exit);
   void AppendDoWhile(HSubgraph* body,
                      IterationStatement* statement,
                      HSubgraph* go_back,
                      HSubgraph* exit);
@@ skipping 836 matching lines @@
   const char* filename_;
   HeapStringAllocator string_allocator_;
   StringStream trace_;
   int indent_;
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_HYDROGEN_H_