Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
ed2a6a16
Unverified
Commit
ed2a6a16
authored
Jul 19, 2021
by
Yukihiro "Matz" Matsumoto
Committed by
GitHub
Jul 19, 2021
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5511 from dearblue/binding.3
Explicit write barrier for binding
parents
71c778db
de4523f7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
mrbgems/mruby-binding-core/src/binding-core.c
mrbgems/mruby-binding-core/src/binding-core.c
+3
-0
src/proc.c
src/proc.c
+5
-0
No files found.
mrbgems/mruby-binding-core/src/binding-core.c
View file @
ed2a6a16
...
...
@@ -151,6 +151,9 @@ binding_local_variable_set(mrb_state *mrb, mrb_value self)
mrb_value
*
e
=
binding_local_variable_search
(
mrb
,
proc
,
env
,
varname
);
if
(
e
)
{
*
e
=
obj
;
if
(
!
mrb_immediate_p
(
obj
))
{
mrb_field_write_barrier
(
mrb
,
(
struct
RBasic
*
)
env
,
(
struct
RBasic
*
)
mrb_obj_ptr
(
obj
));
}
}
else
{
mrb_proc_merge_lvar
(
mrb
,
(
mrb_irep
*
)
proc
->
body
.
irep
,
env
,
1
,
&
varname
,
&
obj
);
...
...
src/proc.c
View file @
ed2a6a16
...
...
@@ -419,6 +419,11 @@ mrb_proc_merge_lvar(mrb_state *mrb, mrb_irep *irep, struct REnv *env, int num, c
memmove
(
destlv
,
lv
,
sizeof
(
mrb_sym
)
*
num
);
if
(
stack
)
{
memmove
(
destst
,
stack
,
sizeof
(
mrb_value
)
*
num
);
for
(
int
i
=
0
;
i
<
num
;
i
++
)
{
if
(
!
mrb_immediate_p
(
stack
[
i
]))
{
mrb_field_write_barrier
(
mrb
,
(
struct
RBasic
*
)
env
,
(
struct
RBasic
*
)
mrb_obj_ptr
(
stack
[
i
]));
}
}
}
else
{
for
(
int
i
=
num
;
i
>
0
;
i
--
,
destst
++
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment