diff mbox

Merging Luc's master branch.

Message ID CANeU7QmTWRDtY0C=xBOSBfji3QNr7FGug+Luqi-LgNCyKjPtXQ@mail.gmail.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Christopher Li March 2, 2018, 10:58 a.m. UTC 
Hi Luc,

I just try a merge with your stable branch from master.

After fix up the first round of conflict, here is what I got:

https://git.kernel.org/pub/scm/devel/sparse/chrisl/sparse.git/log/?h=merge-luc-master

There are two test case failure. I fix the cse-size one.

The llvm one looks like it is cause by the host llvm has different output?

Chris

  TEST    call-variadic (backend/call-variadic.c)
error: actual output text does not match expected output text.
error: see backend/call-variadic.c.output.* for further investigation.
 L0:
--
To unsubscribe from this list: send the line "unsubscribe linux-sparse" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Luc Van Oostenryck March 2, 2018, 11:07 a.m. UTC | #1 
On Fri, Mar 02, 2018 at 02:58:11AM -0800, Christopher Li wrote:
> Hi Luc,

Hi,
 
> I just try a merge with your stable branch from master.
> 
> After fix up the first round of conflict, here is what I got:
> 
> https://git.kernel.org/pub/scm/devel/sparse/chrisl/sparse.git/log/?h=merge-luc-master
> 
> There are two test case failure. I fix the cse-size one.

Yes, I did this a few days ago and theer was only a few trivial conflicts.
 
> The llvm one looks like it is cause by the host llvm has different output?

That's strange.
I can't look at this just now but I'll do in a few hours.
 
-- Luc
--
To unsubscribe from this list: send the line "unsubscribe linux-sparse" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Luc Van Oostenryck March 2, 2018, 6:44 p.m. UTC | #2 
On Fri, Mar 02, 2018 at 02:58:11AM -0800, Christopher Li wrote:
> Hi Luc,
> 
> I just try a merge with your stable branch from master.

What I propose is a two-step plan:
1) - We take the minimal/urgent patches
   - bump the version number up to 0.5.2
   - you push a release
   I'll send a PR for this as soon as my tests will be done.

2) Once the release is published I send you a PR with the merge
   of my tree.

Is this OK for you?

-- Luc
--
To unsubscribe from this list: send the line "unsubscribe linux-sparse" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- backend/call-variadic.c.output.expected 2018-03-02 01:28:03.049309010 -0800
+++ backend/call-variadic.c.output.got 2018-03-02 01:28:03.044309132 -0800
@@ -1,5 +1,7 @@ 
 ; ModuleID = '<stdin>'
 source_filename = "sparse"
+target datalayout =
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"

 define i32 @foo(i8* %ARG1., i32 %ARG2., i64 %ARG3., i32* %ARG4.) {