Skip to content
Snippets Groups Projects
Commit 92d7ed1b authored by Adam Welc's avatar Adam Welc
Browse files

Removed remaining post-merge comments.

parent b4145022
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/PromiseHelperNode.java
+ 0
− 8
View file @ 92d7ed1b
......@@ -257,21 +257,13 @@ public class PromiseHelperNode extends RBaseNode {
}
}
// <<<<<<<HEAD
private static VirtualEvalFrame wrapPromiseFrame(VirtualFrame frame, Frame promiseFrame) {
return VirtualEvalFrame.create(promiseFrame.materialize(), RArguments.getFunction(promiseFrame),
RCaller.createForPromise(RArguments.getCall(promiseFrame), frame == null ? 0 : RArguments.getDepth(frame)));
}
// private static Object generateValueEagerSlowPath(VirtualFrame frame, OptType optType,
// EagerPromise promise) {
// =======
private static Object generateValueEagerSlowPath(VirtualFrame frame, PromiseState state, EagerPromise promise) {
assert state.isEager() || state == PromiseState.Promised;
// >>>>>>> a4dddf1... RPromise refactoring: always use Closures, store PromiseType and OptType in
// one field, remove VarArgsPromise, more assertions
if (!promise.isDeoptimized()) {
Assumption eagerAssumption = promise.getIsValidAssumption();
if (eagerAssumption.isValid()) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment