diff options
| author | Mike Pall <mike> | 2014-07-04 18:19:16 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-07-04 18:19:16 +0200 |
| commit | 5f370d9071cb773c36df5add8fc0dbc7e4aa17eb (patch) | |
| tree | f23aadfb07f0741d480423af4d6a518e8ac3c0c3 | |
| parent | 0ac4c439654c94e48c5625aa2d7b8c405ebe1e90 (diff) | |
| parent | f948fe0c2797bb75ed2147ef86795b082712c96b (diff) | |
| download | luajit-5f370d9071cb773c36df5add8fc0dbc7e4aa17eb.tar.gz luajit-5f370d9071cb773c36df5add8fc0dbc7e4aa17eb.tar.bz2 luajit-5f370d9071cb773c36df5add8fc0dbc7e4aa17eb.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lj_crecord.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lj_crecord.c b/src/lj_crecord.c index 4119533f..4e64f431 100644 --- a/src/lj_crecord.c +++ b/src/lj_crecord.c | |||
| @@ -860,8 +860,11 @@ again: | |||
| 860 | 860 | ||
| 861 | /* Resolve reference for field. */ | 861 | /* Resolve reference for field. */ |
| 862 | ct = ctype_get(cts, sid); | 862 | ct = ctype_get(cts, sid); |
| 863 | if (ctype_isref(ct->info)) | 863 | if (ctype_isref(ct->info)) { |
| 864 | ptr = emitir(IRT(IR_XLOAD, IRT_PTR), ptr, 0); | 864 | ptr = emitir(IRT(IR_XLOAD, IRT_PTR), ptr, 0); |
| 865 | sid = ctype_cid(ct->info); | ||
| 866 | ct = ctype_get(cts, sid); | ||
| 867 | } | ||
| 865 | 868 | ||
| 866 | while (ctype_isattrib(ct->info)) | 869 | while (ctype_isattrib(ct->info)) |
| 867 | ct = ctype_child(cts, ct); /* Skip attributes. */ | 870 | ct = ctype_child(cts, ct); /* Skip attributes. */ |