From 91a7cb57fc9da419f81655f092bab0f147316c2f Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Wed, 2 Nov 2016 18:34:27 -0700
Subject: [PATCH] AsCharacterFactor: handle change to InheritsNode
---
.../oracle/truffle/r/nodes/builtin/base/AsCharacterFactor.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsCharacterFactor.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsCharacterFactor.java
index aa29bd8250..1db6100ba1 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsCharacterFactor.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AsCharacterFactor.java
@@ -43,13 +43,14 @@ import com.oracle.truffle.r.runtime.ops.na.NACheck;
@RBuiltin(name = "asCharacterFactor", kind = INTERNAL, parameterNames = "x", behavior = PURE)
public abstract class AsCharacterFactor extends RBuiltinNode {
private final NACheck naCheck = NACheck.create();
+ private static final RStringVector CLASS_FACTOR_VEC = RDataFactory.createStringVectorFromScalar(RRuntime.CLASS_FACTOR);
@Child InheritsNode inheritsNode = InheritsNodeGen.create();
@Child CastToVectorNode castToVectorNode = CastToVectorNode.create();
@Specialization
protected RStringVector doAsCharacterFactor(Object x) {
- byte isFactor = (byte) inheritsNode.executeObject(x, RRuntime.CLASS_FACTOR, false);
+ byte isFactor = (byte) inheritsNode.execute(x, CLASS_FACTOR_VEC, false);
if (isFactor == RRuntime.LOGICAL_FALSE) {
throw RError.error(RError.SHOW_CALLER, RError.Message.COERCE_NON_FACTOR);
}
--
GitLab