Version 7.3.492.1 (cherry-pick)

LeszekSwirski · LeszekSwirski · commit 9df9418edf64 · 2019-01-23T16:06:17.000Z
Merged 42b50b7 Revert "[build][torque] remove workarounds for clang bug" TBR=hablich@chromium.org Change-Id: Ib398b13fa10b711659aea20d7a4c8abb3c475c79 Reviewed-on: https://chromium-review.googlesource.com/c/1430071 Reviewed-by: Leszek Swirski <leszeks@chromium.org> Cr-Commit-Position: refs/heads/7.3.492@{v8#2} Cr-Branched-From: be213cf-refs/heads/master@{#59024}
diff --git a/BUILD.gn b/BUILD.gn
@@ -3050,6 +3050,9 @@ v8_source_set("torque_base") {
   ]
 
   configs = [ ":internal_config" ]
+  if (is_win && is_asan) {
+    remove_configs = [ "//build/config/sanitizers:default_sanitizer_flags" ]
+  }
 }
 
 v8_component("v8_libbase") {
@@ -3413,6 +3416,9 @@ if (current_toolchain == v8_snapshot_toolchain) {
     ]
 
     configs = [ ":internal_config" ]
+    if (is_win && is_asan) {
+      remove_configs = [ "//build/config/sanitizers:default_sanitizer_flags" ]
+    }
   }
 }
 
diff --git a/include/v8-version.h b/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 7
 #define V8_MINOR_VERSION 3
 #define V8_BUILD_NUMBER 492
-#define V8_PATCH_LEVEL 0
+#define V8_PATCH_LEVEL 1
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
diff --git a/src/torque/instructions.h b/src/torque/instructions.h
@@ -207,7 +207,10 @@ struct LoadObjectFieldInstruction : InstructionBase {
   TORQUE_INSTRUCTION_BOILERPLATE()
   LoadObjectFieldInstruction(const ClassType* class_type,
                              std::string field_name)
-      : class_type(class_type), field_name(std::move(field_name)) {}
+      : class_type(class_type) {
+    // The normal way to write this triggers a bug in Clang on Windows.
+    this->field_name = std::move(field_name);
+  }
   const ClassType* class_type;
   std::string field_name;
 };
@@ -216,7 +219,10 @@ struct StoreObjectFieldInstruction : InstructionBase {
   TORQUE_INSTRUCTION_BOILERPLATE()
   StoreObjectFieldInstruction(const ClassType* class_type,
                               std::string field_name)
-      : class_type(class_type), field_name(std::move(field_name)) {}
+      : class_type(class_type) {
+    // The normal way to write this triggers a bug in Clang on Windows.
+    this->field_name = std::move(field_name);
+  }
   const ClassType* class_type;
   std::string field_name;
 };
@@ -389,8 +395,10 @@ struct ReturnInstruction : InstructionBase {
 
 struct PrintConstantStringInstruction : InstructionBase {
   TORQUE_INSTRUCTION_BOILERPLATE()
-  explicit PrintConstantStringInstruction(std::string message)
-      : message(std::move(message)) {}
+  explicit PrintConstantStringInstruction(std::string message) {
+    // The normal way to write this triggers a bug in Clang on Windows.
+    this->message = std::move(message);
+  }
 
   std::string message;
 };
@@ -399,8 +407,10 @@ struct AbortInstruction : InstructionBase {
   TORQUE_INSTRUCTION_BOILERPLATE()
   enum class Kind { kDebugBreak, kUnreachable, kAssertionFailure };
   bool IsBlockTerminator() const override { return kind != Kind::kDebugBreak; }
-  explicit AbortInstruction(Kind kind, std::string message = "")
-      : kind(kind), message(std::move(message)) {}
+  explicit AbortInstruction(Kind kind, std::string message = "") : kind(kind) {
+    // The normal way to write this triggers a bug in Clang on Windows.
+    this->message = std::move(message);
+  }
 
   Kind kind;
   std::string message;

Original file line number	Diff line number	Diff line change
`@@ -3050,6 +3050,9 @@ v8_source_set("torque_base") {`
`3050`	`3050`	`]`
`3051`	`3051`
`3052`	`3052`	`configs = [ ":internal_config" ]`
	`3053`	`+ if (is_win && is_asan) {`
	`3054`	`+ remove_configs = [ "//build/config/sanitizers:default_sanitizer_flags" ]`
	`3055`	`+ }`
`3053`	`3056`	`}`
`3054`	`3057`
`3055`	`3058`	`v8_component("v8_libbase") {`
`@@ -3413,6 +3416,9 @@ if (current_toolchain == v8_snapshot_toolchain) {`
`3413`	`3416`	`]`
`3414`	`3417`
`3415`	`3418`	`configs = [ ":internal_config" ]`
	`3419`	`+ if (is_win && is_asan) {`
	`3420`	`+ remove_configs = [ "//build/config/sanitizers:default_sanitizer_flags" ]`
	`3421`	`+ }`
`3416`	`3422`	`}`
`3417`	`3423`	`}`
`3418`	`3424`