Add a primitive for id (mypyc/mypyc#684)

msullivan · web-flow · commit 39fe615e0a9b · 2019-08-18T13:36:31.000-07:00
diff --git a/mypyc/lib-rt/CPy.h b/mypyc/lib-rt/CPy.h
@@ -624,6 +624,10 @@ static inline bool CPyTagged_IsLe(CPyTagged left, CPyTagged right) {
     }
 }
 
+static CPyTagged CPyTagged_Id(PyObject *o) {
+    return CPyTagged_FromSsize_t((Py_ssize_t)o);
+}
+
 static PyObject *CPyList_GetItemUnsafe(PyObject *list, CPyTagged index) {
     Py_ssize_t n = CPyTagged_ShortAsSsize_t(index);
     PyObject *result = PyList_GET_ITEM(list, n);
diff --git a/mypyc/ops_misc.py b/mypyc/ops_misc.py
@@ -48,6 +48,12 @@
             emit=name_emit('Py_NotImplemented'),
             is_borrowed=True)
 
+func_op(name='builtins.id',
+        arg_types=[object_rprimitive],
+        result_type=int_rprimitive,
+        error_kind=ERR_NEVER,
+        emit=call_emit('CPyTagged_Id'))
+
 iter_op = func_op(name='builtins.iter',
                   arg_types=[object_rprimitive],
                   result_type=object_rprimitive,
diff --git a/test-data/analysis.test b/test-data/analysis.test
@@ -511,104 +511,85 @@ def lol(x: object) -> int:
     return st + 1
 [out]
 def lol(x):
-    x, r0 :: object
-    r1 :: str
-    r2, r3 :: object
-    r4, st :: int
-    r5 :: tuple[object, object, object]
-    r6 :: object
-    r7 :: str
-    r8 :: object
-    r9 :: bool
+    x :: object
+    r0, st :: int
+    r1 :: tuple[object, object, object]
+    r2 :: object
+    r3 :: str
+    r4 :: object
+    r5 :: bool
+    r6 :: short_int
+    r7 :: int
+    r8, r9 :: bool
     r10 :: short_int
-    r11 :: int
-    r12, r13 :: bool
-    r14 :: short_int
-    r15, r16 :: int
+    r11, r12 :: int
 L0:
 L1:
-    r0 = builtins.module :: static
-    r1 = unicode_1 :: static  ('id')
-    r2 = getattr r0, r1
-    if is_error(r2) goto L5 (error at lol:3) else goto L2
+    r0 = id x :: object
+    st = r0
+    goto L10
 L2:
-    r3 = py_call(r2, x)
-    if is_error(r3) goto L5 (error at lol:3) else goto L3
+    r1 = error_catch
+    r2 = builtins.module :: static
+    r3 = unicode_1 :: static  ('Exception')
+    r4 = getattr r2, r3
+    if is_error(r4) goto L8 (error at lol:4) else goto L3
 L3:
-    r4 = unbox(int, r3)
-    if is_error(r4) goto L5 (error at lol:3) else goto L4
+    r5 = exc_matches r4
+    if r5 goto L4 else goto L5 :: bool
 L4:
-    st = r4
-    goto L13
+    r6 = 1
+    r7 = -r6 :: int
+    restore_exc_info r1
+    return r7
 L5:
-    r5 = error_catch
-    r6 = builtins.module :: static
-    r7 = unicode_2 :: static  ('Exception')
-    r8 = getattr r6, r7
-    if is_error(r8) goto L11 (error at lol:4) else goto L6
+    reraise_exc; r8 = 0
+    if not r8 goto L8 else goto L6 :: bool
 L6:
-    r9 = exc_matches r8
-    if r9 goto L7 else goto L8 :: bool
+    unreachable
 L7:
-    r10 = 1
-    r11 = -r10 :: int
-    restore_exc_info r5
-    return r11
+    restore_exc_info r1
+    goto L10
 L8:
-    reraise_exc; r12 = 0
-    if not r12 goto L11 else goto L9 :: bool
+    restore_exc_info r1
+    r9 = keep_propagating
+    if not r9 goto L11 else goto L9 :: bool
 L9:
     unreachable
 L10:
-    restore_exc_info r5
-    goto L13
+    r10 = 1
+    r11 = st + r10 :: int
+    return r11
 L11:
-    restore_exc_info r5
-    r13 = keep_propagating
-    if not r13 goto L14 else goto L12 :: bool
-L12:
-    unreachable
-L13:
-    r14 = 1
-    r15 = st + r14 :: int
-    return r15
-L14:
-    r16 = <error> :: int
-    return r16
+    r12 = <error> :: int
+    return r12
 (0, 0)   {x}                     {x}
-(1, 0)   {x}                     {r0, x}
-(1, 1)   {r0, x}                 {r0, r1, x}
-(1, 2)   {r0, r1, x}             {r2, x}
-(1, 3)   {r2, x}                 {r2, x}
-(2, 0)   {r2, x}                 {r3}
-(2, 1)   {r3}                    {r3}
-(3, 0)   {r3}                    {r4}
-(3, 1)   {r4}                    {r4}
-(4, 0)   {r4}                    {st}
-(4, 1)   {st}                    {st}
-(5, 0)   {}                      {r5}
-(5, 1)   {r5}                    {r5, r6}
-(5, 2)   {r5, r6}                {r5, r6, r7}
-(5, 3)   {r5, r6, r7}            {r5, r8}
-(5, 4)   {r5, r8}                {r5, r8}
-(6, 0)   {r5, r8}                {r5, r9}
-(6, 1)   {r5, r9}                {r5}
-(7, 0)   {r5}                    {r10, r5}
-(7, 1)   {r10, r5}               {r11, r5}
-(7, 2)   {r11, r5}               {r11}
-(7, 3)   {r11}                   {}
-(8, 0)   {r5}                    {r12, r5}
-(8, 1)   {r12, r5}               {r5}
+(1, 0)   {x}                     {r0}
+(1, 1)   {r0}                    {st}
+(1, 2)   {st}                    {st}
+(2, 0)   {}                      {r1}
+(2, 1)   {r1}                    {r1, r2}
+(2, 2)   {r1, r2}                {r1, r2, r3}
+(2, 3)   {r1, r2, r3}            {r1, r4}
+(2, 4)   {r1, r4}                {r1, r4}
+(3, 0)   {r1, r4}                {r1, r5}
+(3, 1)   {r1, r5}                {r1}
+(4, 0)   {r1}                    {r1, r6}
+(4, 1)   {r1, r6}                {r1, r7}
+(4, 2)   {r1, r7}                {r7}
+(4, 3)   {r7}                    {}
+(5, 0)   {r1}                    {r1, r8}
+(5, 1)   {r1, r8}                {r1}
+(6, 0)   {}                      {}
+(7, 0)   {r1, st}                {st}
+(7, 1)   {st}                    {st}
+(8, 0)   {r1}                    {}
+(8, 1)   {}                      {r9}
+(8, 2)   {r9}                    {}
 (9, 0)   {}                      {}
-(10, 0)  {r5, st}                {st}
-(10, 1)  {st}                    {st}
-(11, 0)  {r5}                    {}
-(11, 1)  {}                      {r13}
-(11, 2)  {r13}                   {}
-(12, 0)  {}                      {}
-(13, 0)  {st}                    {r14, st}
-(13, 1)  {r14, st}               {r15}
-(13, 2)  {r15}                   {}
-(14, 0)  {}                      {r16}
-(14, 1)  {r16}                   {}
+(10, 0)  {st}                    {r10, st}
+(10, 1)  {r10, st}               {r11}
+(10, 2)  {r11}                   {}
+(11, 0)  {}                      {r12}
+(11, 1)  {r12}                   {}
 
diff --git a/test-data/genops-classes.test b/test-data/genops-classes.test
@@ -262,17 +262,11 @@ L0:
     return r1
 def C.foo(self, x):
     self :: C
-    x, r0 :: object
-    r1 :: str
-    r2, r3 :: object
-    r4 :: int
+    x :: object
+    r0 :: int
 L0:
-    r0 = builtins.module :: static
-    r1 = unicode_5 :: static  ('id')
-    r2 = getattr r0, r1
-    r3 = py_call(r2, x)
-    r4 = unbox(int, r3)
-    return r4
+    r0 = id x :: object
+    return r0
 def C.foo__B_glue(self, x):
     self :: C
     x :: object

Original file line number	Diff line number	Diff line change
`@@ -624,6 +624,10 @@ static inline bool CPyTagged_IsLe(CPyTagged left, CPyTagged right) {`
`624`	`624`	`}`
`625`	`625`	`}`
`626`	`626`
	`627`	`+static CPyTagged CPyTagged_Id(PyObject *o) {`
	`628`	`+ return CPyTagged_FromSsize_t((Py_ssize_t)o);`
	`629`	`+}`
	`630`	`+`
`627`	`631`	`static PyObject CPyList_GetItemUnsafe(PyObject list, CPyTagged index) {`
`628`	`632`	`Py_ssize_t n = CPyTagged_ShortAsSsize_t(index);`
`629`	`633`	`PyObject *result = PyList_GET_ITEM(list, n);`