Merge remote-tracking branch 'upstream/main' into update-netrc

ShaharNaveh · ShaharNaveh · commit 989c2b7c96bc · 2025-08-12T10:22:30.000+03:00
diff --git a/compiler/codegen/src/compile.rs b/compiler/codegen/src/compile.rs
@@ -2254,15 +2254,6 @@ impl Compiler {
     ) -> CompileResult<u32> {
         let mut num_annotations = 0;
 
-        // Handle return annotation first
-        if let Some(annotation) = returns {
-            self.emit_load_const(ConstantData::Str {
-                value: "return".into(),
-            });
-            self.compile_annotation(annotation)?;
-            num_annotations += 1;
-        }
-
         // Handle parameter annotations
         let parameters_iter = std::iter::empty()
             .chain(&parameters.posonlyargs)
@@ -2282,6 +2273,15 @@ impl Compiler {
             }
         }
 
+        // Handle return annotation last
+        if let Some(annotation) = returns {
+            self.emit_load_const(ConstantData::Str {
+                value: "return".into(),
+            });
+            self.compile_annotation(annotation)?;
+            num_annotations += 1;
+        }
+
         Ok(num_annotations)
     }
 
@@ -4398,7 +4398,7 @@ impl Compiler {
 
         for item in unpacked {
             self.compile_expression(&item.value)?;
-            emit!(self, Instruction::DictUpdate);
+            emit!(self, Instruction::DictUpdate { index: 1 });
         }
 
         Ok(())
diff --git a/compiler/core/src/bytecode.rs b/compiler/core/src/bytecode.rs
@@ -667,7 +667,9 @@ pub enum Instruction {
     BuildMapForCall {
         size: Arg<u32>,
     },
-    DictUpdate,
+    DictUpdate {
+        index: Arg<u32>,
+    },
     BuildSlice {
         /// whether build a slice with a third step argument
         step: Arg<bool>,
@@ -1397,7 +1399,7 @@ impl Instruction {
                 let nargs = size.get(arg);
                 -(nargs as i32) + 1
             }
-            DictUpdate => -1,
+            DictUpdate { .. } => -1,
             BuildSlice { step } => -2 - (step.get(arg) as i32) + 1,
             ListAppend { .. } | SetAdd { .. } => -1,
             MapAdd { .. } => -2,
@@ -1586,7 +1588,7 @@ impl Instruction {
             BuildSetFromTuples { size } => w!(BuildSetFromTuples, size),
             BuildMap { size } => w!(BuildMap, size),
             BuildMapForCall { size } => w!(BuildMapForCall, size),
-            DictUpdate => w!(DictUpdate),
+            DictUpdate { index } => w!(DictUpdate, index),
             BuildSlice { step } => w!(BuildSlice, step),
             ListAppend { i } => w!(ListAppend, i),
             SetAdd { i } => w!(SetAdd, i),
diff --git a/extra_tests/snippets/syntax_annotations.py b/extra_tests/snippets/syntax_annotations.py
@@ -0,0 +1,10 @@
+from typing import get_type_hints
+
+def func(s: str) -> int:
+    return int(s)
+
+hints = get_type_hints(func)
+
+# The order of type hints matters for certain functions
+# e.g. functools.singledispatch
+assert list(hints.items()) == [('s', str), ('return', int)]
diff --git a/vm/src/frame.rs b/vm/src/frame.rs
@@ -800,26 +800,40 @@ impl ExecutingFrame<'_> {
             bytecode::Instruction::BuildMapForCall { size } => {
                 self.execute_build_map_for_call(vm, size.get(arg))
             }
-            bytecode::Instruction::DictUpdate => {
-                let other = self.pop_value();
-                let dict = self
-                    .top_value()
-                    .downcast_ref::<PyDict>()
-                    .expect("exact dict expected");
+            bytecode::Instruction::DictUpdate { index } => {
+                // Stack before: [..., dict, ..., source]  (source at TOS)
+                // Stack after:  [..., dict, ...]  (source consumed)
+                // The dict to update is at position TOS-i (before popping source)
+
+                let idx = index.get(arg);
+
+                // Pop the source from TOS
+                let source = self.pop_value();
+
+                // Get the dict to update (it's now at TOS-(i-1) after popping source)
+                let dict = if idx <= 1 {
+                    // DICT_UPDATE 0 or 1: dict is at TOS (after popping source)
+                    self.top_value()
+                } else {
+                    // DICT_UPDATE n: dict is at TOS-(n-1)
+                    self.nth_value(idx - 1)
+                };
+
+                let dict = dict.downcast_ref::<PyDict>().expect("exact dict expected");
 
                 // For dictionary unpacking {**x}, x must be a mapping
                 // Check if the object has the mapping protocol (keys method)
                 if vm
-                    .get_method(other.clone(), vm.ctx.intern_str("keys"))
+                    .get_method(source.clone(), vm.ctx.intern_str("keys"))
                     .is_none()
                 {
                     return Err(vm.new_type_error(format!(
                         "'{}' object is not a mapping",
-                        other.class().name()
+                        source.class().name()
                     )));
                 }
 
-                dict.merge_object(other, vm)?;
+                dict.merge_object(source, vm)?;
                 Ok(None)
             }
             bytecode::Instruction::BuildSlice { step } => {
