summaryrefslogtreecommitdiff
path: root/chromium/v8/src/builtins/builtins-string-gen.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-12-08 13:24:59 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-12-08 13:24:59 +0100
commitcd7832ee326b0c424d4ad1538efd074c86a68f9b (patch)
tree158872ea92d5df96b1290b578cbe574aaa2acfd5 /chromium/v8/src/builtins/builtins-string-gen.h
parent93cdb9906305e23304d9ff55350b7557fc1850cb (diff)
parent69b8f9169ffd66fdeca1ac60a4bc06b91d106186 (diff)
downloadqtwebengine-chromium-cd7832ee326b0c424d4ad1538efd074c86a68f9b.tar.gz
Merge remote-tracking branch 'origin/upstream-master' into 63-based
Change-Id: I4d88054034fccbb7409fa65c37d4498b74ec0578
Diffstat (limited to 'chromium/v8/src/builtins/builtins-string-gen.h')
-rw-r--r--chromium/v8/src/builtins/builtins-string-gen.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/chromium/v8/src/builtins/builtins-string-gen.h b/chromium/v8/src/builtins/builtins-string-gen.h
index 607f7b6acb2..c9af3802707 100644
--- a/chromium/v8/src/builtins/builtins-string-gen.h
+++ b/chromium/v8/src/builtins/builtins-string-gen.h
@@ -82,9 +82,11 @@ class StringBuiltinsAssembler : public CodeStubAssembler {
// }
//
// Contains fast paths for Smi and RegExp objects.
+ // Important: {regexp_call} may not contain any code that can call into JS.
typedef std::function<Node*()> NodeFunction0;
typedef std::function<Node*(Node* fn)> NodeFunction1;
void MaybeCallFunctionAtSymbol(Node* const context, Node* const object,
+ Node* const maybe_string,
Handle<Symbol> symbol,
const NodeFunction0& regexp_call,
const NodeFunction1& generic_call,