diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-08 13:24:59 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-08 13:24:59 +0100 |
| commit | cd7832ee326b0c424d4ad1538efd074c86a68f9b (patch) | |
| tree | 158872ea92d5df96b1290b578cbe574aaa2acfd5 /chromium/v8/src/compiler/js-create-lowering.cc | |
| parent | 93cdb9906305e23304d9ff55350b7557fc1850cb (diff) | |
| parent | 69b8f9169ffd66fdeca1ac60a4bc06b91d106186 (diff) | |
| download | qtwebengine-chromium-cd7832ee326b0c424d4ad1538efd074c86a68f9b.tar.gz | |
Merge remote-tracking branch 'origin/upstream-master' into 63-based
Change-Id: I4d88054034fccbb7409fa65c37d4498b74ec0578
Diffstat (limited to 'chromium/v8/src/compiler/js-create-lowering.cc')
| -rw-r--r-- | chromium/v8/src/compiler/js-create-lowering.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/v8/src/compiler/js-create-lowering.cc b/chromium/v8/src/compiler/js-create-lowering.cc index d740f7681cb..bd4f1069abb 100644 --- a/chromium/v8/src/compiler/js-create-lowering.cc +++ b/chromium/v8/src/compiler/js-create-lowering.cc @@ -255,13 +255,14 @@ Reduction JSCreateLowering::ReduceJSCreate(Node* node) { Node* const control = NodeProperties::GetControlInput(node); // Extract constructor and original constructor function. if (target_type->IsHeapConstant() && new_target_type->IsHeapConstant() && + target_type->AsHeapConstant()->Value()->IsJSFunction() && new_target_type->AsHeapConstant()->Value()->IsJSFunction()) { Handle<JSFunction> constructor = Handle<JSFunction>::cast(target_type->AsHeapConstant()->Value()); + if (!constructor->IsConstructor()) return NoChange(); Handle<JSFunction> original_constructor = Handle<JSFunction>::cast(new_target_type->AsHeapConstant()->Value()); - DCHECK(constructor->IsConstructor()); - DCHECK(original_constructor->IsConstructor()); + if (!original_constructor->IsConstructor()) return NoChange(); // Check if we can inline the allocation. if (IsAllocationInlineable(constructor, original_constructor)) { |