1 files changed, 4 insertions, 4 deletions
diff --git a/insns.def b/insns.def
index 685f49f606..4a12a5b930 100644
--- a/insns.def
+++ b/insns.def
@@ -1951,11 +1951,11 @@ opt_length
 {
     if (!SPECIAL_CONST_P(recv) &&
 	BASIC_OP_UNREDEFINED_P(BOP_LENGTH)) {
-	if (HEAP_CLASS_OF(recv) == rb_cArray) {
-	    val = LONG2NUM(RARRAY_LEN(recv));
+	if (HEAP_CLASS_OF(recv) == rb_cString) {
+	    val = rb_str_length(recv);
 	}
-	else if (HEAP_CLASS_OF(recv) == rb_cString) {
-	    val = LONG2NUM(RSTRING_LEN(recv));
+	else if (HEAP_CLASS_OF(recv) == rb_cArray) {
+	    val = LONG2NUM(RARRAY_LEN(recv));
 	}
 	else if (HEAP_CLASS_OF(recv) == rb_cHash) {
 	    val = INT2FIX(RHASH(recv)->tbl->num_entries);