Reviewers: Benedikt Meurer,
Description:
Make presubmit script happy again.
No clue why this seems to be an issue only for me, though...
Please review this at https://codereview.chromium.org/321123002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+21, -20 lines):
M include/v8-util.h
M samples/process.cc
M src/base/build_config.h
M src/jsregexp.cc
M src/mips/assembler-mips.h
M src/mips/assembler-mips.cc
M src/mips/macro-assembler-mips.cc
Index: include/v8-util.h
diff --git a/include/v8-util.h b/include/v8-util.h
index
86549252b836bbad8c89d8aa667245c683b4bbff..1eaf1ab68f6be618a6690c25b7e10a297e88ee6e
100644
--- a/include/v8-util.h
+++ b/include/v8-util.h
@@ -154,7 +154,7 @@ class PersistentValueMap {
*/
bool SetReturnValue(const K& key,
ReturnValue<Value> returnValue) {
- return SetReturnValueFromVal(returnValue, Traits::Get(&impl_, key));
+ return SetReturnValueFromVal(&returnValue, Traits::Get(&impl_, key));
}
/**
@@ -227,7 +227,7 @@ class PersistentValueMap {
}
template<typename T>
bool SetReturnValue(ReturnValue<T> returnValue) {
- return SetReturnValueFromVal(returnValue, value_);
+ return SetReturnValueFromVal(&returnValue, value_);
}
void Reset() {
value_ = kPersistentContainerNotFound;
@@ -309,10 +309,10 @@ class PersistentValueMap {
}
static bool SetReturnValueFromVal(
- ReturnValue<Value>& returnValue, PersistentContainerValue value) {
+ ReturnValue<Value>* returnValue, PersistentContainerValue value) {
bool hasValue = value != kPersistentContainerNotFound;
if (hasValue) {
- returnValue.SetInternal(
+ returnValue->SetInternal(
*reinterpret_cast<internal::Object**>(FromVal(value)));
}
return hasValue;
Index: samples/process.cc
diff --git a/samples/process.cc b/samples/process.cc
index
7cfbc9ee1e96c0d572d279abfd526e7f3708db28..b279a8d32ef60cb2bd6fe1a42657fd8c777fc4c4
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<string, string>& options,
+ map<string, string>* 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<string, string> 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;
Index: src/base/build_config.h
diff --git a/src/base/build_config.h b/src/base/build_config.h
index
1263a56b22b2144d3989f4023fd478b25a16418e..e412b92dfef4f4c919ddc87dc8303a00aa41a277
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
Index: src/jsregexp.cc
diff --git a/src/jsregexp.cc b/src/jsregexp.cc
index
60d9f04f9df2481cc62afba1c6482393ad4caa64..8f378a6064b150a7c972930bd15cee0acb0137e3
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--;
Index: src/mips/assembler-mips.cc
diff --git a/src/mips/assembler-mips.cc b/src/mips/assembler-mips.cc
index
6716ecda9656b8887cdece9e695ab2ba18f8d7ab..97aed6b552a83606ad9613b727dae17d43952cd3
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) {
Index: src/mips/assembler-mips.h
diff --git a/src/mips/assembler-mips.h b/src/mips/assembler-mips.h
index
3d080910f8124a65b126e798647a65ea450b5b47..2ba3ef7166f2f9023adb77c5d128dd12a51768bc
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);
Index: src/mips/macro-assembler-mips.cc
diff --git a/src/mips/macro-assembler-mips.cc
b/src/mips/macro-assembler-mips.cc
index
fd54221dec65a22f38b9ae5669bec559b0f66b5b..a779333a9a16fd57ae0178723eed92b7f79f28fd
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);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
