From: svenpanne@chromium.org Date: Tue, 10 Jun 2014 09:24:00 +0000 (+0000) Subject: Make presubmit script happy again. X-Git-Tag: upstream/4.7.83~8762 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e02158e8c15cfb8c589c0efa3ad3730c77bc84bd;p=platform%2Fupstream%2Fv8.git Make presubmit script happy again. No clue why this seems to be an issue only for me, though... R=bmeurer@chromium.org Review URL: https://codereview.chromium.org/321123002 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@21735 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- diff --git a/include/v8-util.h b/include/v8-util.h index 8654925..1eaf1ab 100644 --- a/include/v8-util.h +++ b/include/v8-util.h @@ -154,7 +154,7 @@ class PersistentValueMap { */ bool SetReturnValue(const K& key, ReturnValue returnValue) { - return SetReturnValueFromVal(returnValue, Traits::Get(&impl_, key)); + return SetReturnValueFromVal(&returnValue, Traits::Get(&impl_, key)); } /** @@ -227,7 +227,7 @@ class PersistentValueMap { } template bool SetReturnValue(ReturnValue returnValue) { - return SetReturnValueFromVal(returnValue, value_); + return SetReturnValueFromVal(&returnValue, value_); } void Reset() { value_ = kPersistentContainerNotFound; @@ -309,10 +309,10 @@ class PersistentValueMap { } static bool SetReturnValueFromVal( - ReturnValue& returnValue, PersistentContainerValue value) { + ReturnValue* returnValue, PersistentContainerValue value) { bool hasValue = value != kPersistentContainerNotFound; if (hasValue) { - returnValue.SetInternal( + returnValue->SetInternal( *reinterpret_cast(FromVal(value))); } return hasValue; diff --git a/samples/process.cc b/samples/process.cc index 7cfbc9e..b279a8d 100644 --- a/samples/process.cc +++ b/samples/process.cc @@ -574,7 +574,7 @@ StringHttpRequest::StringHttpRequest(const string& path, void ParseOptions(int argc, char* argv[], - map& options, + map* options, string* file) { for (int i = 1; i < argc; i++) { string arg = argv[i]; @@ -584,7 +584,7 @@ void ParseOptions(int argc, } else { string key = arg.substr(0, index); string value = arg.substr(index+1); - options[key] = value; + (*options)[key] = value; } } } @@ -646,7 +646,7 @@ int main(int argc, char* argv[]) { v8::V8::InitializeICU(); map options; string file; - ParseOptions(argc, argv, options, &file); + ParseOptions(argc, argv, &options, &file); if (file.empty()) { fprintf(stderr, "No script was specified.\n"); return 1; diff --git a/src/base/build_config.h b/src/base/build_config.h index 1263a56..e412b92d 100644 --- a/src/base/build_config.h +++ b/src/base/build_config.h @@ -58,7 +58,7 @@ // Target architecture detection. This may be set externally. If not, detect // in the same way as the host architecture, that is, target the native // environment as presented by the compiler. -#if !V8_TARGET_ARCH_X64 && !V8_TARGET_ARCH_IA32 && !V8_TARGET_ARCH_X87 &&\ +#if !V8_TARGET_ARCH_X64 && !V8_TARGET_ARCH_IA32 && !V8_TARGET_ARCH_X87 && \ !V8_TARGET_ARCH_ARM && !V8_TARGET_ARCH_ARM64 && !V8_TARGET_ARCH_MIPS #if defined(_M_X64) || defined(__x86_64__) #define V8_TARGET_ARCH_X64 1 diff --git a/src/jsregexp.cc b/src/jsregexp.cc index 60d9f04..8f378a6 100644 --- a/src/jsregexp.cc +++ b/src/jsregexp.cc @@ -1208,8 +1208,9 @@ void Trace::RestoreAffectedRegisters(RegExpMacroAssembler* assembler, const OutSet& registers_to_pop, const OutSet& registers_to_clear) { for (int reg = max_register; reg >= 0; reg--) { - if (registers_to_pop.Get(reg)) assembler->PopRegister(reg); - else if (registers_to_clear.Get(reg)) { + if (registers_to_pop.Get(reg)) { + assembler->PopRegister(reg); + } else if (registers_to_clear.Get(reg)) { int clear_to = reg; while (reg > 0 && registers_to_clear.Get(reg - 1)) { reg--; diff --git a/src/mips/assembler-mips.cc b/src/mips/assembler-mips.cc index 6716ecd..97aed6b 100644 --- a/src/mips/assembler-mips.cc +++ b/src/mips/assembler-mips.cc @@ -1185,7 +1185,7 @@ void Assembler::jal_or_jalr(int32_t target, Register rs) { } -//-------Data-processing-instructions--------- +// -------Data-processing-instructions--------- // Arithmetic. @@ -1328,7 +1328,7 @@ void Assembler::rotrv(Register rd, Register rt, Register rs) { } -//------------Memory-instructions------------- +// ------------Memory-instructions------------- // Helper for base-reg + offset, when offset is larger than int16. void Assembler::LoadRegPlusOffsetToAt(const MemOperand& src) { @@ -1445,7 +1445,7 @@ void Assembler::lui(Register rd, int32_t j) { } -//-------------Misc-instructions-------------- +// -------------Misc-instructions-------------- // Break / Trap instructions. void Assembler::break_(uint32_t code, bool break_as_stop) { @@ -1618,7 +1618,7 @@ void Assembler::pref(int32_t hint, const MemOperand& rs) { } -//--------Coprocessor-instructions---------------- +// --------Coprocessor-instructions---------------- // Load, store, move. void Assembler::lwc1(FPURegister fd, const MemOperand& src) { diff --git a/src/mips/assembler-mips.h b/src/mips/assembler-mips.h index 3d08091..2ba3ef7 100644 --- a/src/mips/assembler-mips.h +++ b/src/mips/assembler-mips.h @@ -646,7 +646,7 @@ class Assembler : public AssemblerBase { void jal_or_jalr(int32_t target, Register rs); - //-------Data-processing-instructions--------- + // -------Data-processing-instructions--------- // Arithmetic. void addu(Register rd, Register rs, Register rt); @@ -684,7 +684,7 @@ class Assembler : public AssemblerBase { void rotrv(Register rd, Register rt, Register rs); - //------------Memory-instructions------------- + // ------------Memory-instructions------------- void lb(Register rd, const MemOperand& rs); void lbu(Register rd, const MemOperand& rs); @@ -700,12 +700,12 @@ class Assembler : public AssemblerBase { void swr(Register rd, const MemOperand& rs); - //----------------Prefetch-------------------- + // ----------------Prefetch-------------------- void pref(int32_t hint, const MemOperand& rs); - //-------------Misc-instructions-------------- + // -------------Misc-instructions-------------- // Break / Trap instructions. void break_(uint32_t code, bool break_as_stop = false); @@ -738,7 +738,7 @@ class Assembler : public AssemblerBase { void ins_(Register rt, Register rs, uint16_t pos, uint16_t size); void ext_(Register rt, Register rs, uint16_t pos, uint16_t size); - //--------Coprocessor-instructions---------------- + // --------Coprocessor-instructions---------------- // Load, store, and move. void lwc1(FPURegister fd, const MemOperand& src); diff --git a/src/mips/macro-assembler-mips.cc b/src/mips/macro-assembler-mips.cc index fd54221..a779333 100644 --- a/src/mips/macro-assembler-mips.cc +++ b/src/mips/macro-assembler-mips.cc @@ -867,7 +867,7 @@ void MacroAssembler::Pref(int32_t hint, const MemOperand& rs) { } -//------------Pseudo-instructions------------- +// ------------Pseudo-instructions------------- void MacroAssembler::Ulw(Register rd, const MemOperand& rs) { lwr(rd, rs);