Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMake fixes #296

Merged
merged 6 commits into from
Aug 31, 2022
Merged

CMake fixes #296

merged 6 commits into from
Aug 31, 2022

Conversation

Ninja3047
Copy link
Contributor

@Ninja3047 Ninja3047 commented Aug 26, 2022

  • move doctest to cxx-common: add doctest, used in a number of projects cxx-common#964 and remove submodule from repo
  • update git_watcher.cmake to fix some bugs, most notably changing CMAKE_BINARY_DIR to CMAKE_CURRENT_BINARY_DIR
  • remove llvm.cmake and janky find_llvm, use upstream llvm recommended cmake incantation
  • update FindZ3.cmake to fix some bugs, most notably changing CMAKE_SOURCE_DIR a temporary path

@Ninja3047
Copy link
Contributor Author

won't build until lifting-bits/cxx-common#964 gets merged and tagged so do not merge until then

@github-actions
Copy link

See the diff generated by this PR for the tests here: https://github.com/lifting-bits/rellic/actions/runs/2950063358

fizzbuzz.bc

typedefs_of_typedefs.bc

switch_loop.bc

func_cond_zero_arg.bc

fcmp.bc

conflicting_names.bc

struct.bc

issue_183_literal_structs.bc

zeroinit.bc

issue_127_uint128_t_lit.bc

struct_swap.bc

init_list.bc

ret0.bc

bool.bc

short.bc

cast.bc

nullptr.bc

nested_struct.bc

array_swap.bc

binops.bc

bitmask.bc

loop.bc

float.bc

reg_test_structure_fields.bc

vectors.bc

funcptr.bc

goto_loop.bc

branch.bc

bitops.bc

trunc.bc

inttoptr.bc

issue_4.bc

issue_123_uint128_t.bc

fizzbuzz_stateful.bc

issue_94_strncmp.bc

global_using_function_decl.bc

byval_struct.bc

nested_while.bc

--- /dev/fd/63	2022-08-29 16:33:47.666364756 +0000
+++ /dev/fd/62	2022-08-29 16:33:47.666364756 +0000
@@ -18,14 +18,14 @@
                 printf("loop1 x: %d\n", var1);
             }
     }
-    if ((int)var1 >= 20 || (int)var1 <= 10) {
+    if ((int)var1 <= 10 || (int)var1 >= 20) {
         while ((int)var1 < 20)
             {
                 var1 = var1 + 1U;
                 printf("loop2 x: %d\n", var1);
             }
     }
-    if (((int)var1 >= 20 || (int)var1 <= 10) && (int)var1 >= 20) {
+    if (((int)var1 <= 10 || (int)var1 >= 20) && (int)var1 >= 20) {
         return var0;
     }
 }

func_cond_two_arg.bc

conflicting_global.bc

assert.bc

zext.bc

switch.bc

template_parameter_pack.bc

byval_tail_nogep.ll

byval_tail_gep.ll

@Ninja3047 Ninja3047 requested a review from ekilmer August 30, 2022 19:09
Copy link
Contributor

@ekilmer ekilmer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you for the cleanup!

@Ninja3047 Ninja3047 marked this pull request as ready for review August 31, 2022 01:52
@Ninja3047 Ninja3047 requested a review from frabert August 31, 2022 01:53
@frabert frabert merged commit b2e6946 into master Aug 31, 2022
@frabert frabert deleted the will/cmake-fixes branch August 31, 2022 07:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants