Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a66b3d9bee32
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ffd065961ff2
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Dec 2, 2015

  1. lit-test: fix devirtualization/*.

    whitequark committed Dec 2, 2015
    Copy the full SHA
    5b1b494 View commit details
  2. lit-test: fix inferencer/class.

    whitequark committed Dec 2, 2015
    Copy the full SHA
    ffd0659 View commit details
Showing with 8 additions and 2 deletions.
  1. +6 −0 lit-test/test/devirtualization/device_db.pyon
  2. +1 −1 lit-test/test/devirtualization/function.py
  3. +1 −1 lit-test/test/inferencer/class.py
6 changes: 6 additions & 0 deletions lit-test/test/devirtualization/device_db.pyon
Original file line number Diff line number Diff line change
@@ -4,5 +4,11 @@
"module": "artiq.coredevice.comm_dummy",
"class": "Comm",
"arguments": {}
},
"core": {
"type": "local",
"module": "artiq.coredevice.core",
"class": "Core",
"arguments": {"ref_period": 1e-9}
}
}
2 changes: 1 addition & 1 deletion lit-test/test/devirtualization/function.py
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
from artiq.language.core import *
from artiq.language.types import *

# CHECK-L: call ()->NoneType %local.testbench.entrypoint ; calls testbench.entrypoint
# CHECK-L: call ()->NoneType delay('b) %local.testbench.entrypoint ; calls testbench.entrypoint

@kernel
def baz():
2 changes: 1 addition & 1 deletion lit-test/test/inferencer/class.py
Original file line number Diff line number Diff line change
@@ -15,5 +15,5 @@ def m(self):
# CHECK-L: .f:()->NoneType delay('b)
c.f

# CHECK-L: .m:method(fn=(self:<instance c>)->NoneType delay('c), self=<instance c>)
# CHECK-L: .m:method(fn=(self:<instance c>)->NoneType delay('d), self=<instance c>)
c().m()