-
Notifications
You must be signed in to change notification settings - Fork 29.6k
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
src: fix http2 debug build errors #16432
Conversation
Currently building with debug enabled produces the following errors: In file included from ../src/node_http2.h:6: ../src/node_http2_core-inl.h:465:18: error: expected ';' after do/while statement CHECK_GT(id, 0) ^ ; ../src/node_http2_core-inl.h:469:18: error: use of undeclared identifier 'spec' OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); ^ ../src/node_http2_core-inl.h:469:34: error: use of undeclared identifier 'spec' OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); ^ ../src/node_http2_core-inl.h:469:47: error: use of undeclared identifier 'spec' OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); ^ This commit adds the missing semicolon to fix the above error. ../src/node_http2.cc:92:9: error: reference to non-static member function must be called; did you mean to call it with no arguments? CHECK(object->Has(context, env()->ongetpadding_string()).FromJust()); ^~~~~~ ../src/util.h:120:20: note: expanded from macro 'CHECK' if (UNLIKELY(!(expr))) { \ ^~~~ ../src/util.h:107:44: note: expanded from macro 'UNLIKELY' For this issue I was not sure what the correct check would be so I've just commented it out and will update after feedback.
368192d
to
06726f2
Compare
src/node_http2.cc
Outdated
@@ -89,7 +89,7 @@ ssize_t Http2Session::OnCallbackPadding(size_t frameLen, | |||
Context::Scope context_scope(context); | |||
|
|||
#if defined(DEBUG) && DEBUG | |||
CHECK(object->Has(context, env()->ongetpadding_string()).FromJust()); | |||
// CHECK(object->Has(context, env()->ongetpadding_string()).FromJust()); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think
CHECK(object->Has(context, env()->ongetpadding_string().FromJust()));
is the right one. Without which, the whole expression was evaluated to be a value type, while we expect to have a boolean type for the CHECK.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM with the comment addressed
src/node_http2.cc
Outdated
@@ -89,7 +89,7 @@ ssize_t Http2Session::OnCallbackPadding(size_t frameLen, | |||
Context::Scope context_scope(context); | |||
|
|||
#if defined(DEBUG) && DEBUG | |||
CHECK(object->Has(context, env()->ongetpadding_string()).FromJust()); | |||
// CHECK(object->Has(context, env()->ongetpadding_string()).FromJust()); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be
CHECK(object()->Has(context, env()->ongetpadding_string()).FromJust());
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, I was missing where object was coming from. Will update shortly.
I would like to see this land in less than 48 hours, pending a CI run, if no one objects. Feel free to use the 'confused' emoji to let me know otherwise :) |
Landed in a9f5084, thanks! |
Currently building with debug enabled produces the following errors: In file included from ../src/node_http2.h:6: ../src/node_http2_core-inl.h:465:18: error: expected ';' after do/while statement CHECK_GT(id, 0) ^ ; ../src/node_http2_core-inl.h:469:18: error: use of undeclared identifier 'spec' OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); ^ ../src/node_http2_core-inl.h:469:34: error: use of undeclared identifier 'spec' OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); ^ ../src/node_http2_core-inl.h:469:47: error: use of undeclared identifier 'spec' OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); ^ This commit adds the missing semicolon to fix the above error. ../src/node_http2.cc:92:9: error: reference to non-static member function must be called; did you mean to call it with no arguments? CHECK(object->Has(context, env()->ongetpadding_string()).FromJust()); ^~~~~~ ../src/util.h:120:20: note: expanded from macro 'CHECK' if (UNLIKELY(!(expr))) { \ ^~~~ ../src/util.h:107:44: note: expanded from macro 'UNLIKELY' For this issue I was not sure what the correct check would be so I've just commented it out and will update after feedback. PR-URL: #16432 Reviewed-By: Anatoli Papirovski <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>
Currently building with debug enabled produces the following errors: In file included from ../src/node_http2.h:6: ../src/node_http2_core-inl.h:465:18: error: expected ';' after do/while statement CHECK_GT(id, 0) ^ ; ../src/node_http2_core-inl.h:469:18: error: use of undeclared identifier 'spec' OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); ^ ../src/node_http2_core-inl.h:469:34: error: use of undeclared identifier 'spec' OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); ^ ../src/node_http2_core-inl.h:469:47: error: use of undeclared identifier 'spec' OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); ^ This commit adds the missing semicolon to fix the above error. ../src/node_http2.cc:92:9: error: reference to non-static member function must be called; did you mean to call it with no arguments? CHECK(object->Has(context, env()->ongetpadding_string()).FromJust()); ^~~~~~ ../src/util.h:120:20: note: expanded from macro 'CHECK' if (UNLIKELY(!(expr))) { \ ^~~~ ../src/util.h:107:44: note: expanded from macro 'UNLIKELY' For this issue I was not sure what the correct check would be so I've just commented it out and will update after feedback. PR-URL: nodejs/node#16432 Reviewed-By: Anatoli Papirovski <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>
Currently building with debug enabled produces the following errors: In file included from ../src/node_http2.h:6: ../src/node_http2_core-inl.h:465:18: error: expected ';' after do/while statement CHECK_GT(id, 0) ^ ; ../src/node_http2_core-inl.h:469:18: error: use of undeclared identifier 'spec' OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); ^ ../src/node_http2_core-inl.h:469:34: error: use of undeclared identifier 'spec' OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); ^ ../src/node_http2_core-inl.h:469:47: error: use of undeclared identifier 'spec' OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); ^ This commit adds the missing semicolon to fix the above error. ../src/node_http2.cc:92:9: error: reference to non-static member function must be called; did you mean to call it with no arguments? CHECK(object->Has(context, env()->ongetpadding_string()).FromJust()); ^~~~~~ ../src/util.h:120:20: note: expanded from macro 'CHECK' if (UNLIKELY(!(expr))) { \ ^~~~ ../src/util.h:107:44: note: expanded from macro 'UNLIKELY' For this issue I was not sure what the correct check would be so I've just commented it out and will update after feedback. PR-URL: nodejs#16432 Reviewed-By: Anatoli Papirovski <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>
Currently building with debug enabled produces the following errors: In file included from ../src/node_http2.h:6: ../src/node_http2_core-inl.h:465:18: error: expected ';' after do/while statement CHECK_GT(id, 0) ^ ; ../src/node_http2_core-inl.h:469:18: error: use of undeclared identifier 'spec' OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); ^ ../src/node_http2_core-inl.h:469:34: error: use of undeclared identifier 'spec' OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); ^ ../src/node_http2_core-inl.h:469:47: error: use of undeclared identifier 'spec' OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); ^ This commit adds the missing semicolon to fix the above error. ../src/node_http2.cc:92:9: error: reference to non-static member function must be called; did you mean to call it with no arguments? CHECK(object->Has(context, env()->ongetpadding_string()).FromJust()); ^~~~~~ ../src/util.h:120:20: note: expanded from macro 'CHECK' if (UNLIKELY(!(expr))) { \ ^~~~ ../src/util.h:107:44: note: expanded from macro 'UNLIKELY' For this issue I was not sure what the correct check would be so I've just commented it out and will update after feedback. PR-URL: nodejs/node#16432 Reviewed-By: Anatoli Papirovski <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>
Currently building with debug enabled produces the following errors:
This commit adds the missing semicolon to fix the above error.
For this issue I was not sure what the correct check would be so I've
just commented it out and will update after feedback.
Checklist
make -j4 test
(UNIX), orvcbuild test
(Windows) passesAffected core subsystem(s)
src