[automerger] [DO NOT MERGE] Disable optimizing compiler for pac file am: 42183d3219 am: 50e1143b8e am: c385fd9595 am: a78c99055f skipped: be646ff0cb
Change-Id: I55edac7f02a6dae665896a0d352455239eb37eaa
diff --git a/Android.mk b/Android.mk
index 5b794c7..ae0e768 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,6 +18,7 @@
-Wno-import \
-Wno-format \
-Wno-unused-parameter \
+ -Werror
LOCAL_C_INCLUDES += $(LOCAL_PATH)/src $(LOCAL_PATH)/../v8
diff --git a/src/net_util.cc b/src/net_util.cc
index 992cdd1..8eef03a 100644
--- a/src/net_util.cc
+++ b/src/net_util.cc
@@ -64,7 +64,7 @@
// <IPv6-literal> "/" <number of bits>
std::vector<std::string> parts;
- unsigned int split = cidr_literal.find('/');
+ size_t split = cidr_literal.find('/');
if (split == std::string::npos)
return false;
parts.push_back(cidr_literal.substr(0, split));
diff --git a/src/proxy_resolver_v8.cc b/src/proxy_resolver_v8.cc
index 0504b03..f978694 100644
--- a/src/proxy_resolver_v8.cc
+++ b/src/proxy_resolver_v8.cc
@@ -762,10 +762,6 @@
if (script_data.size() == 0)
return ERR_PAC_SCRIPT_FAILED;
- // Disable JIT
- static const char kNoOpt[] = "--no-opt";
- v8::V8::SetFlagsFromString(kNoOpt, strlen(kNoOpt));
-
// Try parsing the PAC script.
ArrayBufferAllocator allocator;
v8::Isolate::CreateParams create_params;
diff --git a/test/js-unittest/b_132073833.js b/test/js-unittest/b_132073833.js
deleted file mode 100644
index 79d1967..0000000
--- a/test/js-unittest/b_132073833.js
+++ /dev/null
@@ -1,21 +0,0 @@
-function FindProxyForURL(url, host){
- function opt() {
- opt['x'] = 1.1;
- try {
- Object.create(object);
- } catch (e) {
- }
-
- for (let i = 0; i < 100000; i++) {
-
- }
- }
-
- opt();
- object = opt;
- opt();
-
- return "DIRECT";
-}
-
-var object;
\ No newline at end of file
diff --git a/test/proxy_resolver_v8_unittest.cc b/test/proxy_resolver_v8_unittest.cc
index 73e4405..be7ecee 100644
--- a/test/proxy_resolver_v8_unittest.cc
+++ b/test/proxy_resolver_v8_unittest.cc
@@ -558,19 +558,5 @@
EXPECT_EQ("DIRECT", proxies[0]);
}
-TEST(ProxyResolverV8Test, B_132073833) {
- ProxyResolverV8WithMockBindings resolver(new MockJSBindings());
- int result = resolver.SetPacScript(String16(B_132073833_JS));
- EXPECT_EQ(OK, result);
-
- // Execute FindProxyForURL().
- result = resolver.GetProxyForURL(kQueryUrl, kQueryHost, &kResults);
-
- EXPECT_EQ(OK, result);
- std::vector<std::string> proxies = string16ToProxyList(kResults);
- EXPECT_EQ(1U, proxies.size());
- EXPECT_EQ("DIRECT", proxies[0]);
-}
-
} // namespace
} // namespace net
diff --git a/test/proxy_test_script.h b/test/proxy_test_script.h
index aa10016..80c96c7 100644
--- a/test/proxy_test_script.h
+++ b/test/proxy_test_script.h
@@ -4,29 +4,6 @@
#ifndef PROXY_TEST_SCRIPT_H_
#define PROXY_TEST_SCRIPT_H_
-#define B_132073833_JS \
- "function FindProxyForURL(url, host){\n" \
- " function opt() {\n" \
- " opt['x'] = 1.1;\n" \
- " try {\n" \
- " Object.create(object);\n" \
- " } catch (e) {\n" \
- " }\n" \
- "\n" \
- " for (let i = 0; i < 100000; i++) {\n" \
- "\n" \
- " }\n" \
- " }\n" \
- "\n" \
- " opt();\n" \
- " object = opt;\n" \
- " opt();\n" \
- "\n" \
- " return \"DIRECT\";\n" \
- "}\n" \
- "\n" \
- "var object;\n" \
-
#define BINDING_FROM_GLOBAL_JS \
"// Calls a bindings outside of FindProxyForURL(). This causes the code to\n" \
"// get exercised during initialization.\n" \
@@ -103,7 +80,7 @@
#define CHANGE_ELEMENT_KIND_JS \
"// PAC script with getter that changes element kind.\n" \
- "\n" \
+ " \n" \
"function FindProxyForURL(url, host) {\n" \
" let arr = [];\n" \
" arr[1000] = 0x1234;\n" \
@@ -114,7 +91,7 @@
" });\n" \
"\n" \
" let results = Object.entries(arr);\n" \
- " let str = results.toString();\n" \
+ " let str = results.toString(); \n" \
" return \"DIRECT\";\n" \
"}\n" \
