Fix unpackSequence() to use _nameOp() rather than LOAD_FAST

diff --git a/Lib/compiler/pycodegen.py b/Lib/compiler/pycodegen.py
index 444b06538861ce2220d4d653f1017070fbb9364b..c0bbed3f51ac01337e97c9ae085edad16e30a899 100644 (file)
--- a/Lib/compiler/pycodegen.py
+++ b/Lib/compiler/pycodegen.py
@@ -1117,7 +1117,7 @@ class AbstractFunctionCode:
             if type(elt) == types.TupleType:
                 self.unpackSequence(elt)
             else:
-                self.emit('STORE_FAST', elt)
+                self._nameOp('STORE', elt)
 
     unpackTuple = unpackSequence
 
@@ -1153,6 +1153,7 @@ class AbstractClassCode:
             self.setDocstring(klass.doc)
 
     def _nameOp(self, prefix, name):
+        # Class namespaces are always unoptimized
         self.emit(prefix + '_NAME', name)
 
     def finish(self):

diff --git a/Tools/compiler/compiler/pycodegen.py b/Tools/compiler/compiler/pycodegen.py
index 444b06538861ce2220d4d653f1017070fbb9364b..c0bbed3f51ac01337e97c9ae085edad16e30a899 100644 (file)
--- a/Tools/compiler/compiler/pycodegen.py
+++ b/Tools/compiler/compiler/pycodegen.py
@@ -1117,7 +1117,7 @@ class AbstractFunctionCode:
             if type(elt) == types.TupleType:
                 self.unpackSequence(elt)
             else:
-                self.emit('STORE_FAST', elt)
+                self._nameOp('STORE', elt)
 
     unpackTuple = unpackSequence
 
@@ -1153,6 +1153,7 @@ class AbstractClassCode:
             self.setDocstring(klass.doc)
 
     def _nameOp(self, prefix, name):
+        # Class namespaces are always unoptimized
         self.emit(prefix + '_NAME', name)
 
     def finish(self):