Failed to apply patch for src/full-codegen.cc:
While running git apply --index -3 -p1;
error: patch failed: src/full-codegen.cc:438
Falling back to three-way merge...
Applied patch to 'src/full-codegen.cc' with conflicts.
U src/full-codegen.cc
Patch: src/full-codegen.cc
Index: src/full-codegen.cc
diff --git a/src/full-codegen.cc b/src/full-codegen.cc
index
4f1db4e99343a692b1f3dfe89a12f5614e1d3267..80141db5729d6d7af72f9591527996c94b71fb60
100644
--- a/src/full-codegen.cc
+++ b/src/full-codegen.cc
@@ -438,14 +438,6 @@
TypeFeedbackId id) {
Handle<Code> ic = CodeFactory::LoadIC(isolate(), contextual_mode).code();
CallIC(ic, id);
-}
-
-
-void FullCodeGenerator::CallGlobalLoadIC(Handle<String> name) {
- if (masm()->serializer_enabled()) return CallLoadIC(CONTEXTUAL);
- Handle<Code> ic = CodeFactory::LoadGlobalIC(
- isolate(), isolate()->global_object(),
name).code();
- CallIC(ic, TypeFeedbackId::None());
}
https://codereview.chromium.org/983053002/
--
--
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.
