backup2

youknowone · youknowone · commit 7a03b28913b2 · 2025-07-20T22:37:04.000+09:00
diff --git a/compiler/codegen/src/compile.rs b/compiler/codegen/src/compile.rs
@@ -430,7 +430,6 @@ impl Compiler<'_> {
         slice: &Expr,
         ctx: ExprContext,
     ) -> CompileResult<()> {
-        // In CPython:
         // 1. Check subscripter and index for Load context
         // 2. VISIT value
         // 3. Handle two-element slice specially
@@ -463,7 +462,7 @@ impl Compiler<'_> {
             }
         } else {
             // VISIT(c, expr, e->v.Subscript.slice)
-            self.compile_subscript_slice(slice)?;
+            self.compile_expression(slice)?;
 
             // Emit appropriate instruction based on context
             match ctx {
@@ -481,29 +480,6 @@ impl Compiler<'_> {
         Ok(())
     }
 
-    /// Compile a subscript slice, handling starred expressions in tuples
-    // = compiler_subscript() - specifically the VISIT(c, expr, slice) part
-    fn compile_subscript_slice(&mut self, slice: &Expr) -> CompileResult<()> {
-        // In CPython, compiler_subscript just does VISIT(c, expr, e->v.Subscript.slice)
-        // which calls compiler_visit_expr, which in turn calls compiler_tuple for Tuple_kind
-        // In Load context, compiler_tuple uses starunpack_helper
-
-        match slice {
-            // Special handling for tuple in subscript context
-            // This matches CPython's compiler_tuple behavior for Load context
-            Expr::Tuple(ExprTuple { elts, ctx, .. }) if matches!(ctx, ExprContext::Load) => {
-                // Use starunpack_helper to handle potential starred expressions
-                // This is equivalent to CPython's compiler_tuple calling starunpack_helper
-                self.starunpack_helper(elts, 0, CollectionType::Tuple)?;
-            }
-            // For all other cases (including Store/Del context tuples), compile normally
-            _ => {
-                self.compile_expression(slice)?;
-            }
-        }
-        Ok(())
-    }
-
     /// Helper function for compiling tuples/lists/sets with starred expressions
     ///
     /// Parameters:
@@ -4220,7 +4196,7 @@ impl Compiler<'_> {
                 // For augmented assignment, we need to load the value first
                 // But we can't use compile_subscript directly because we need DUP_TOP2
                 self.compile_expression(value)?;
-                self.compile_subscript_slice(slice)?;
+                self.compile_expression(slice)?;
                 emit!(self, Instruction::Duplicate2);
                 emit!(self, Instruction::Subscript);
                 AugAssignKind::Subscript
