summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2014-11-27 18:29:13 +0100
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2014-11-27 18:29:13 +0100
commit9f20b7108e66a3455dc9f86ab7cc6c732f1d5caf (patch)
treea9ed1962d8e21eae30eee19cfec51a14a4a4ba52 /Source/JavaScriptCore
parent47c78dea382da032f7baace418e06388c056c820 (diff)
parent18cb1a3ae907d76da9eb8c54528cf3bcb074d0e5 (diff)
downloadqtwebkit-9f20b7108e66a3455dc9f86ab7cc6c732f1d5caf.tar.gz
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I075d973264e841fea66d9cd64af72132cffcc0a6
Diffstat (limited to 'Source/JavaScriptCore')
-rw-r--r--Source/JavaScriptCore/disassembler/udis86/itab.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/disassembler/udis86/itab.py b/Source/JavaScriptCore/disassembler/udis86/itab.py
index 3d50ad061..90bd3e02c 100644
--- a/Source/JavaScriptCore/disassembler/udis86/itab.py
+++ b/Source/JavaScriptCore/disassembler/udis86/itab.py
@@ -314,7 +314,7 @@ class UdItabGenerator( ud_opcode.UdOpcodeTables ):
self.ItabH.write( "\n" )
self.ItabH.write("\n/* itab entry operand definitions */\n");
- operands = self.OperandDict.keys()
+ operands = list( self.OperandDict.keys() )
operands.sort()
for o in operands:
self.ItabH.write("#define O_%-7s { %-12s %-8s }\n" %