Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: src/hydrogen-instructions.h

Issue 25665006: Fix failure in unit tests (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/hydrogen.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 1914 matching lines...) Expand 10 before | Expand all | Expand 10 after
1925 InliningKind inlining_kind_; 1925 InliningKind inlining_kind_;
1926 Variable* arguments_var_; 1926 Variable* arguments_var_;
1927 HArgumentsObject* arguments_object_; 1927 HArgumentsObject* arguments_object_;
1928 bool undefined_receiver_; 1928 bool undefined_receiver_;
1929 ZoneList<HBasicBlock*> return_targets_; 1929 ZoneList<HBasicBlock*> return_targets_;
1930 }; 1930 };
1931 1931
1932 1932
1933 class HLeaveInlined V8_FINAL : public HTemplateInstruction<0> { 1933 class HLeaveInlined V8_FINAL : public HTemplateInstruction<0> {
1934 public: 1934 public:
1935 explicit HLeaveInlined(int drop_count) : drop_count_(drop_count) { } 1935 HLeaveInlined(HEnterInlined* entry,
1936 int drop_count)
1937 : entry_(entry),
1938 drop_count_(drop_count) { }
1936 1939
1937 virtual Representation RequiredInputRepresentation(int index) V8_OVERRIDE { 1940 virtual Representation RequiredInputRepresentation(int index) V8_OVERRIDE {
1938 return Representation::None(); 1941 return Representation::None();
1939 } 1942 }
1940 1943
1941 virtual int argument_delta() const V8_OVERRIDE { return -drop_count_; } 1944 virtual int argument_delta() const V8_OVERRIDE {
1945 return entry_->arguments_pushed() ? -drop_count_ : 0;
1946 }
1942 1947
1943 DECLARE_CONCRETE_INSTRUCTION(LeaveInlined) 1948 DECLARE_CONCRETE_INSTRUCTION(LeaveInlined)
1944 1949
1945 private: 1950 private:
1951 HEnterInlined* entry_;
1946 int drop_count_; 1952 int drop_count_;
1947 }; 1953 };
1948 1954
1949 1955
1950 class HPushArgument V8_FINAL : public HUnaryOperation { 1956 class HPushArgument V8_FINAL : public HUnaryOperation {
1951 public: 1957 public:
1952 DECLARE_INSTRUCTION_FACTORY_P1(HPushArgument, HValue*); 1958 DECLARE_INSTRUCTION_FACTORY_P1(HPushArgument, HValue*);
1953 1959
1954 virtual Representation RequiredInputRepresentation(int index) V8_OVERRIDE { 1960 virtual Representation RequiredInputRepresentation(int index) V8_OVERRIDE {
1955 return Representation::Tagged(); 1961 return Representation::Tagged();
(...skipping 5169 matching lines...) Expand 10 before | Expand all | Expand 10 after
7125 virtual bool IsDeletable() const V8_OVERRIDE { return true; } 7131 virtual bool IsDeletable() const V8_OVERRIDE { return true; }
7126 }; 7132 };
7127 7133
7128 7134
7129 #undef DECLARE_INSTRUCTION 7135 #undef DECLARE_INSTRUCTION
7130 #undef DECLARE_CONCRETE_INSTRUCTION 7136 #undef DECLARE_CONCRETE_INSTRUCTION
7131 7137
7132 } } // namespace v8::internal 7138 } } // namespace v8::internal
7133 7139
7134 #endif // V8_HYDROGEN_INSTRUCTIONS_H_ 7140 #endif // V8_HYDROGEN_INSTRUCTIONS_H_
OLDNEW
« no previous file with comments | « src/hydrogen.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698