Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
QueryR
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julien Lopez
QueryR
Commits
0005a82d
Commit
0005a82d
authored
7 years ago
by
Florian Angerer
Browse files
Options
Downloads
Patches
Plain Diff
Revert "Using 'asAbstractVector' instead of 'BoxPrimitiveNode'."
This reverts commit
85cb339f
.
parent
85cb339f
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/CachedExtractVectorNode.java
+10
-1
10 additions, 1 deletion
...ruffle/r/nodes/access/vector/CachedExtractVectorNode.java
with
10 additions
and
1 deletion
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/CachedExtractVectorNode.java
+
10
−
1
View file @
0005a82d
...
...
@@ -39,6 +39,7 @@ import com.oracle.truffle.r.nodes.attributes.SpecialAttributesFunctions.GetDimNa
import
com.oracle.truffle.r.nodes.attributes.SpecialAttributesFunctions.GetNamesAttributeNode
;
import
com.oracle.truffle.r.nodes.attributes.SpecialAttributesFunctions.SetDimAttributeNode
;
import
com.oracle.truffle.r.nodes.attributes.SpecialAttributesFunctions.SetDimNamesAttributeNode
;
import
com.oracle.truffle.r.nodes.binary.BoxPrimitiveNode
;
import
com.oracle.truffle.r.nodes.profile.AlwaysOnBranchProfile
;
import
com.oracle.truffle.r.nodes.profile.VectorLengthProfile
;
import
com.oracle.truffle.r.runtime.RRuntime
;
...
...
@@ -80,6 +81,8 @@ final class CachedExtractVectorNode extends CachedVectorNode {
@Child
private
GetDimNamesAttributeNode
getDimNamesNode
;
@Child
private
GetNamesAttributeNode
getNamesNode
;
@Child
private
GetNamesAttributeNode
getNamesFromDimNamesNode
;
@Child
private
BoxPrimitiveNode
boxOldDimNames
;
@Child
private
BoxPrimitiveNode
boxNewDimName
;
@Children
private
final
CachedExtractVectorNode
[]
extractNames
;
@Children
private
final
CachedExtractVectorNode
[]
extractNamesAlternative
;
...
...
@@ -280,7 +283,13 @@ final class CachedExtractVectorNode extends CachedVectorNode {
}
else
if
(
positionsCheckNode
.
isEmptyPosition
(
i
,
positions
[
i
]))
{
result
=
RNull
.
instance
;
}
else
{
result
=
RRuntime
.
asAbstractVector
(
extract
(
i
,
(
RAbstractStringVector
)
RRuntime
.
asAbstractVector
(
dataAt
),
positions
[
i
],
positionProfile
[
i
]));
if
(
boxOldDimNames
==
null
)
{
boxOldDimNames
=
insert
(
BoxPrimitiveNode
.
create
());
}
if
(
boxNewDimName
==
null
)
{
boxNewDimName
=
insert
(
BoxPrimitiveNode
.
create
());
}
result
=
boxNewDimName
.
execute
(
extract
(
i
,
(
RAbstractStringVector
)
boxOldDimNames
.
execute
(
dataAt
),
positions
[
i
],
positionProfile
[
i
]));
}
newDimNames
[
dimIndex
]
=
result
;
if
(
newDimNamesNames
!=
null
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment