Fix some incorrect array access ops.

JVM is stricter. Unbusts the multi-dispatcher somewhat.
rakudo · May 10, 2013 · 1a2fcbd · 1a2fcbd
1 parent 7bf40c1
commit 1a2fcbd
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Perl6/Metamodel/BOOTSTRAP.nqp b/src/Perl6/Metamodel/BOOTSTRAP.nqp
@@ -703,13 +703,13 @@ BEGIN {
                             $tied++;
                         }
                     }
-                    elsif (%a<type_flags>[$i] +& $TYPE_NATIVE_MASK)
-                      && !(%b<type_flags>[$i] +& $TYPE_NATIVE_MASK) {
+                    elsif (nqp::atpos_i(%a<type_flags>, $i) +& $TYPE_NATIVE_MASK)
+                      && !(nqp::atpos_i(%b<type_flags>, $i) +& $TYPE_NATIVE_MASK) {
                         # Narrower because natives always are.
                         $narrower++;
                     }
-                    elsif (%b<type_flags>[$i] +& $TYPE_NATIVE_MASK)
-                      && !(%a<type_flags>[$i] +& $TYPE_NATIVE_MASK) {
+                    elsif (nqp::atpos_i(%b<type_flags>, $i) +& $TYPE_NATIVE_MASK)
+                      && !(nqp::atpos_i(%a<type_flags>, $i) +& $TYPE_NATIVE_MASK) {
                         # Wider; skip over here so we don't go counting this as tied in
                         # the next branch.
                     }
@@ -781,7 +781,7 @@ BEGIN {
                     unless nqp::isnull($named_names) {
                         if !($flags +& $SIG_ELEM_IS_OPTIONAL) {
                             if nqp::elems($named_names) == 1 {
-                                %info<req_named> := nqp::atpos_s($named_names, 0);
+                                %info<req_named> := nqp::atpos($named_names, 0);
                             }
                         }
                         %info<bind_check> := 1;